Changeset 448

Timestamp:

02/04/07 15:38:39 (18 years ago)

Author:

jerome

Message:

Improved detection of number of copies.

Files:

• pkpgcounter/trunk/pkpgpdls/postscript.py (modified) (2 diffs)

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -171 +171 @@
                     if number > self.pages[pagecount]["copies"] :
                         self.pages[pagecount]["copies"] = number
+            elif line.startswith(r"%RBINumCopies: ") :   
+                try :
+                    number = int(line.strip().split()[1])
+                except :     
+                    pass
+                else :    
+                    if number > self.pages[pagecount]["copies"] :
+                        self.pages[pagecount]["copies"] = number
             previousline = line
             
@@ -178 +186 @@
         
         # now apply the number of copies to each page
+        if not pagecount and pagescomment :    
+            pagecount = pagescomment
         for pnum in range(1, pagecount + 1) :
-            page = self.pages.get(pnum, self.pages.get(1, { "copies" : 1 }))
+            page = self.pages.get(pnum, self.pages.get(1, self.pages.get(0, { "copies" : 1 })))
             copies = page["copies"]
             pagecount += (copies - 1)
             self.logdebug("%s * page #%s" % (copies, pnum))
             
-        if not pagecount and pagescomment :    
-            pagecount = pagescomment
         self.logdebug("Internal parser said : %s pages" % pagecount)
         return (pagecount, notrust)