Changeset 551

Timestamp:

12/09/07 14:32:54 (17 years ago)

Author:

jerome

Message:

Improved parser for pksm ghostscript device.

Files:

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

pkpgcounter/trunk/pkpgpdls/pnmascii.py

@@ -36 +36 @@
            If it's impossible to find one we consider it's not plain text.
         """   
-        if (self.firstblock[:2] in ("P1", "P2", "P3")) :
+        if (self.firstblock.split()[0] in ("P1", "P2", "P3")) :
             self.logdebug("DEBUG: Input file seems to be in the PNM (ascii) format.")
             self.marker = self.firstblock[:2]
@@ -46 +46 @@
         """Counts pages in a PNM (ascii) document."""
         pagecount = 0
+        linecount = 0
+        divby = 1
         marker = self.marker
         for line in self.infile :
+            linecount += 1
+            if (linecount == 2) and (line.find("device=pksm") != -1) :
+                # Special case of cmyk map
+                divby = 4
             pagecount += line.split().count(marker)
-        return pagecount
+            
+        if not (pagecount % divby) :    
+            return pagecount // divby
+        else :    
+            return pagecount