From 2711d8657a5197b9f515e20ff9ec3e06e8cae763 Mon Sep 17 00:00:00 2001 From: msweet Date: Tue, 30 Sep 2014 16:12:03 +0000 Subject: [PATCH] Update the list of operations to match what CUPS supports. Fix an error in listing support for Restart-Job twice. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12170 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 3 +- doc/help/policies.html | 267 ++++++++++++++++++++++------------------- scheduler/printers.c | 95 ++++++++------- 3 files changed, 190 insertions(+), 175 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 04470747b..fb334534e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.0.0 - 2014-09-29 +CHANGES.txt - 2.0.0 - 2014-09-30 -------------------------------- CHANGES IN CUPS V2.0.0 @@ -8,6 +8,7 @@ CHANGES IN CUPS V2.0.0 - Added some USB quirk rules for the libusb-based USB backend (STR #4482) - Spanish localization update (STR #4487) + - Updated documentation for 2.0 release. CHANGES IN CUPS V2.0rc1 diff --git a/doc/help/policies.html b/doc/help/policies.html index 42b789aaf..f7141a58a 100644 --- a/doc/help/policies.html +++ b/doc/help/policies.html @@ -154,19 +154,39 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th - Print-Job - Yes - Creates a print job with a single file. + Activate-Printer + No + Activates a printer or class. - Print-URI + Cancel-Current-Job No - Create a print job with a single URI. + Cancels the current job on a printer or class. - Validate-Job + Cancel-Job Yes - Validates a print request before printing. + Cancels a print job. + + + Cancel-Jobs + Yes + Cancels all print jobs. + + + Cancel-My-Jobs + Yes + Cancels a user's print job. + + + Cancel-Subscription + Yes + Cancels an event subscription. + + + Close-Job + Yes + Closes a user's print job so that it can be printed. Create-Job @@ -174,19 +194,29 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th Creates a print job with no files or URIs. - Send-Document + Create-Job-Subscriptions Yes - Adds a file to a print job. + Creates one or more event subscriptions for a job. - Send-URI + Create-Printer-Subscriptions + Yes + Creates one or more event subscriptions for a printer or the server. + + + Deactivate-Printer No - Adds a URI to a print job. + Deactivates a printer or class. - Cancel-Job + Disable-Printer Yes - Cancels a print job. + Stops a printer or class. + + + Enable-Printer + Yes + Starts a printer or class. Get-Job-Attributes @@ -198,79 +228,83 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th Yes Gets a list of jobs. + + Get-Notifications + Yes + Gets (pending) events for an event subscription. + Get-Printer-Attributes Yes Gets information and options associated with a printer or class. - Hold-Job + Get-Printer-Supported-Values Yes - Holds a print job for printing. + Gets -supported attributes for a printer based on job + options. - Release-Job + Get-Subscription-Attributes Yes - Releases a print job for printing. + Gets information for an event subscription. - Restart-Job + Get-Subscriptions Yes - Reprints a print job. + Gets a list of event subscriptions. - Pause-Printer + Hold-Job Yes - Stops a printer or class. + Holds a print job for printing. - Resume-Printer + Hold-New-Jobs Yes - Starts a printer or class. + Holds new jobs submitted to a printer or class. - Purge-Jobs + Pause-Printer Yes - Cancels all jobs on the server or a printer or class - and removes the job history information. + Stops a printer or class. - Set-Printer-Attributes + Pause-Printer-After-Current-Job No - Sets printer or class information; CUPS uses - CUPS-Add-Modify-Printer and CUPS-Add-Modify-Class - instead. + Stops a printer or class after the current job is finished. - Set-Job-Attributes + Print-Job Yes - Changes job options. + Creates a print job with a single file. - Get-Printer-Supported-Values + Print-URI No - Gets -supported attributes for a printer based on job - options. + Create a print job with a single URI. - Create-Printer-Subscription - Yes - Creates an event subscription for a printer or the server. + Promote-Job + No + Prints a job before others. - Create-Job-Subscription + Purge-Jobs Yes - Creates an event subscription for a job. + Cancels all jobs on the server or a printer or class + and removes the job history information. - Get-Subscription-Attributes + Release-Held-New-Jobs Yes - Gets information for an event subscription. + Releases jobs that were held because of the + Hold-New-Jobs operation. - Get-Subscriptions + Release-Job Yes - Gets a list of event subscriptions. + Releases a print job for printing. Renew-Subscription @@ -278,65 +312,62 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th Renews an event subscription that is about to expire. - Cancel-Subscription - Yes - Cancels an event subscription. + Reprocess-Job + No + Reprints a job on a different printer or class; CUPS has the + CUPS-Move-Job operation instead. - Get-Notifications + Restart-Job Yes - Gets (pending) events for an event subscription. + Reprints a print job. - Send-Notifications + Restart-Printer No - Sends events for an event subscription. + Restarts a printer or class, resuming print jobs as needed. - Get-Printer-Support-Files + Resubmit-Job No - Gets printer driver files for a Novell client. + Reprints a job with new options. - Enable-Printer - Yes - Starts a printer or class. + Resume-Job + No + Resumes printing of a stopped job. - Disable-Printer + Resume-Printer Yes - Stops a printer or class. - - - Pause-Printer-After-Current-Job - No - Stops a printer or class after the current job is finished. + Starts a printer or class. - Hold-New-Jobs + Schedule-Job-After No - Holds new jobs submitted to a printer or class. + Prints a job after others. - Release-Held-New-Jobs - No - Releases jobs that were held because of the - Hold-New-Jobs operation. + Send-Document + Yes + Adds a file to a print job. - Deactivate-Printer + Send-URI No - Deactivates a printer or class. + Adds a URI to a print job. - Activate-Printer - No - Activates a printer or class. + Set-Printer-Attributes + Yes + Sets printer or class information; CUPS uses + CUPS-Add-Modify-Printer and CUPS-Add-Modify-Class + for most attributes instead. - Restart-Printer - No - Restarts a printer or class, resuming print jobs as needed. + Set-Job-Attributes + Yes + Changes job options. Shutdown-Printer @@ -348,46 +379,31 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th No Powers a printer or class on. - - Reprocess-Job - No - Reprints a job on a different printer or class; CUPS has the - CUPS-Move-Job operation instead. - - - Cancel-Current-Job - No - Cancels the current job on a printer or class. - Suspend-Current-Job No Stops the current job on a printer or class. - Resume-Job + Validate-Document No - Resumes printing of a stopped job. + Validates a document request before sending. - Promote-Job - No - Prints a job before others. - - - Schedule-Job-After - No - Prints a job after others. + Validate-Job + Yes + Validates a print request before printing. - CUPS-Get-Default * + CUPS-Accept-Jobs Yes - Gets the server/network default printer or class. + Sets a printer's or class' printer-is-accepting-jobs + attribute to true. - CUPS-Get-Printers * + CUPS-Add-Modify-Class Yes - Gets a list of printers and/or classes. + Adds or modifies a class. CUPS-Add-Modify-Printer @@ -395,19 +411,9 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th Adds or modifies a printer. - CUPS-Delete-Printer * - Yes - Removes a printer. - - - CUPS-Get-Classes * - Yes - Gets a list of classes. - - - CUPS-Add-Modify-Class + CUPS-Authenticate-Job Yes - Adds or modifies a class. + Authenticates a job for printing. CUPS-Delete-Class * @@ -415,46 +421,55 @@ HREF="ref-cupsd-conf.html#LimitIPP">Limit subsections which list th Removes a class. - CUPS-Accept-Jobs + CUPS-Delete-Printer * Yes - Sets a printer's or class' printer-is-accepting-jobs - attribute to true. + Removes a printer. - CUPS-Reject-Jobs + CUPS-Get-Classes * Yes - Sets a printer's or class' printer-is-accepting-jobs - attribute to false. + Gets a list of classes. - CUPS-Set-Default * + CUPS-Get-Default * Yes - Sets the server/network default printer or class. + Gets the server/network default printer or class. CUPS-Get-Devices * Yes Gets a list of printer devices. + + CUPS-Get-Document + Yes + Retrieves a document file from a job. + CUPS-Get-PPDs * Yes Gets a list of printer drivers or manufacturers. + + CUPS-Get-Printers * + Yes + Gets a list of printers and/or classes. + CUPS-Move-Job Yes Moves a job to a different printer or class. - CUPS-Authenticate-Job + CUPS-Reject-Jobs Yes - Authenticates a job for printing. + Sets a printer's or class' printer-is-accepting-jobs + attribute to false. - CUPS-Get-Document + CUPS-Set-Default * Yes - Retrieves a document file from a job. + Sets the server/network default printer or class. diff --git a/scheduler/printers.c b/scheduler/printers.c index 34d887ff9..8fad02df8 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -180,54 +180,53 @@ cupsdCreateCommonData(void) }; static const int ops[] = /* operations-supported values */ { - IPP_PRINT_JOB, - IPP_VALIDATE_JOB, - IPP_CREATE_JOB, - IPP_SEND_DOCUMENT, - IPP_CANCEL_JOB, - IPP_GET_JOB_ATTRIBUTES, - IPP_GET_JOBS, - IPP_GET_PRINTER_ATTRIBUTES, - IPP_HOLD_JOB, - IPP_RELEASE_JOB, - IPP_RESTART_JOB, - IPP_PAUSE_PRINTER, - IPP_RESUME_PRINTER, - IPP_PURGE_JOBS, - IPP_SET_PRINTER_ATTRIBUTES, - IPP_SET_JOB_ATTRIBUTES, - IPP_GET_PRINTER_SUPPORTED_VALUES, - IPP_CREATE_PRINTER_SUBSCRIPTION, - IPP_CREATE_JOB_SUBSCRIPTION, - IPP_GET_SUBSCRIPTION_ATTRIBUTES, - IPP_GET_SUBSCRIPTIONS, - IPP_RENEW_SUBSCRIPTION, - IPP_CANCEL_SUBSCRIPTION, - IPP_GET_NOTIFICATIONS, - IPP_ENABLE_PRINTER, - IPP_DISABLE_PRINTER, - IPP_HOLD_NEW_JOBS, - IPP_RELEASE_HELD_NEW_JOBS, - IPP_CANCEL_JOBS, - IPP_CANCEL_MY_JOBS, - IPP_CLOSE_JOB, - CUPS_GET_DEFAULT, - CUPS_GET_PRINTERS, - CUPS_ADD_PRINTER, - CUPS_DELETE_PRINTER, - CUPS_GET_CLASSES, - CUPS_ADD_CLASS, - CUPS_DELETE_CLASS, - CUPS_ACCEPT_JOBS, - CUPS_REJECT_JOBS, - CUPS_SET_DEFAULT, - CUPS_GET_DEVICES, - CUPS_GET_PPDS, - CUPS_MOVE_JOB, - CUPS_AUTHENTICATE_JOB, - CUPS_GET_PPD, - CUPS_GET_DOCUMENT, - IPP_RESTART_JOB + IPP_OP_PRINT_JOB, + IPP_OP_VALIDATE_JOB, + IPP_OP_CREATE_JOB, + IPP_OP_SEND_DOCUMENT, + IPP_OP_CANCEL_JOB, + IPP_OP_GET_JOB_ATTRIBUTES, + IPP_OP_GET_JOBS, + IPP_OP_GET_PRINTER_ATTRIBUTES, + IPP_OP_HOLD_JOB, + IPP_OP_RELEASE_JOB, + IPP_OP_PAUSE_PRINTER, + IPP_OP_RESUME_PRINTER, + IPP_OP_PURGE_JOBS, + IPP_OP_SET_PRINTER_ATTRIBUTES, + IPP_OP_SET_JOB_ATTRIBUTES, + IPP_OP_GET_PRINTER_SUPPORTED_VALUES, + IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, + IPP_OP_CREATE_JOB_SUBSCRIPTIONS, + IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, + IPP_OP_GET_SUBSCRIPTIONS, + IPP_OP_RENEW_SUBSCRIPTION, + IPP_OP_CANCEL_SUBSCRIPTION, + IPP_OP_GET_NOTIFICATIONS, + IPP_OP_ENABLE_PRINTER, + IPP_OP_DISABLE_PRINTER, + IPP_OP_HOLD_NEW_JOBS, + IPP_OP_RELEASE_HELD_NEW_JOBS, + IPP_OP_CANCEL_JOBS, + IPP_OP_CANCEL_MY_JOBS, + IPP_OP_CLOSE_JOB, + IPP_OP_CUPS_GET_DEFAULT, + IPP_OP_CUPS_GET_PRINTERS, + IPP_OP_CUPS_ADD_MODIFY_PRINTER, + IPP_OP_CUPS_DELETE_PRINTER, + IPP_OP_CUPS_GET_CLASSES, + IPP_OP_CUPS_ADD_MODIFY_CLASS, + IPP_OP_CUPS_DELETE_CLASS, + IPP_OP_CUPS_ACCEPT_JOBS, + IPP_OP_CUPS_REJECT_JOBS, + IPP_OP_CUPS_SET_DEFAULT, + IPP_OP_CUPS_GET_DEVICES, + IPP_OP_CUPS_GET_PPDS, + IPP_OP_CUPS_MOVE_JOB, + IPP_OP_CUPS_AUTHENTICATE_JOB, + IPP_OP_CUPS_GET_PPD, + IPP_OP_CUPS_GET_DOCUMENT, + IPP_OP_RESTART_JOB }; static const char * const charsets[] =/* charset-supported values */ { -- 2.39.2