Changeset 384 for pkpgcounter/trunk/pkpgpdls/postscript.py

Timestamp:

09/04/06 11:14:02 (18 years ago)

Author:

jerome

Message:

Now uses the maximum between the value computed natively and the value
reported with ghostscript, instead of returning 0 pages when ghostscript
was needed but failed.

Files:

• pkpgcounter/trunk/pkpgpdls/postscript.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -168 +168 @@
             self.logdebug("%s * page #%s" % (copies, pnum))
         self.logdebug("Internal parser said : %s pages" % pagecount)
-        
-        if notrust :    
-            pagecount = 0 # Let gs do counting
-        return pagecount
+        return (pagecount, notrust)
         
     def getJobSize(self) :    
         """Count pages in PostScript document."""
         self.copies = 1
-        return self.natively() or self.throughGhostScript()
+        (nbpages, notrust) = self.natively()
+        newnbpages = nbpages
+        if notrust :
+            try :
+                newnbpages = self.throughGhostScript()
+            except pdlparser.PDLParserError, msg :
+                self.logdebug(msg)
+        return max(nbpages, newnbpages)    
         
 def test() :