The IPP backend now sends the job-pages-per-set attribute when printing

multiple copy jobs with finishings (<rdar://problem/16792757>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12422 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index e0df0d5034ac5b3c64afbe8a28f4ecdbbb2a9a5f..8f68ffab20f35cbcebb4ff1d3b774ace53372106 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.1b1 - 2014-12-01
+CHANGES.txt - 2.1b1 - 2015-01-26
 --------------------------------
 
 CHANGES IN CUPS V2.1b1
@@ -7,5 +7,8 @@ CHANGES IN CUPS V2.1b1
          (<rdar://problem/15146999>)
        - The IPP backend now stops sending print data if the printer indicates
          the job has been aborted or canceled (<rdar://problem/17837631>)
+       - The IPP backend now sends the job-pages-per-set attribute when
+         printing multiple copy jobs with finishings
+         (<rdar://problem/16792757>)
        - No longer install banner files since third-party banner filters now
          supply their own (STR #4518)

diff --git a/backend/ipp.c b/backend/ipp.c
index 8edfdcadca8544ee2e2913a3cc7bd34e9d14e293..54870d1f666af06806d387364277416617a5f53c 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -3,7 +3,7 @@
  *
  * IPP backend for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -2927,9 +2927,20 @@ new_request(
                                                          sizeof(finishings[0])),
                                                    finishings);
       if (num_finishings > 0)
+      {
        ippAddIntegers(request, IPP_TAG_JOB, IPP_TAG_ENUM, "finishings",
                       num_finishings, finishings);
 
+       if (copies > 1 && (keyword = cupsGetOption("job-impressions", num_options, options)) != NULL)
+       {
+        /*
+         * Send job-pages-per-set attribute to apply finishings correctly...
+          */
+
+          ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-pages-per-set", atoi(keyword) / copies);
+        }
+      }
+
      /*
       * Map FaxOut options...
       */