Changeset 208

Timestamp:

04/12/05 08:16:35 (20 years ago)

Author:

jerome

Message:

Use raw strings now, maybe it will help with the psyco problem

Location:

pkpgcounter/trunk/pdlanalyzer

Files:

• pdf.py (modified) (1 diff)
• postscript.py (modified) (2 diffs)

pkpgcounter/trunk/pdlanalyzer/pdf.py

@@ -31 +31 @@
     def getJobSize(self) :    
         """Counts pages in a PDF document."""
-        regexp = re.compile(r"(/Type) ?(/Page)[/ \t\r\n]")
+        self.iscolor = None
+        newpageregexp = re.compile(r"(/Type) ?(/Page)[/ \t\r\n]", re.I)
+        colorregexp = re.compile(r"(/ColorSpace) ?(/DeviceRGB|/DeviceCMYK)[/ \t\r\n]", re.I)
         pagecount = 0
         for line in self.infile.xreadlines() : 
-            pagecount += len(regexp.findall(line))
+            pagecount += len(newpageregexp.findall(line))
+            if colorregexp.match(line) :
+                self.iscolor = 1
+                if self.debug :
+                    sys.stderr.write("ColorSpace : %s\n" % line)
         return pagecount    
         

pkpgcounter/trunk/pdlanalyzer/postscript.py

@@ -64 +64 @@
         pagecount = 0
         for line in self.infile.xreadlines() : 
-            if line.startswith("%%Page: ") :
+            if line.startswith(r"%%Page: ") :
                 pagecount += 1
-            elif line.startswith("%%Requirements: numcopies(") :    
+            elif line.startswith(r"%%Requirements: numcopies(") :    
                 try :
                     number = int(line.strip().split('(')[1].split(')')[0])
@@ -74 +74 @@
                     if number > self.copies :
                         self.copies = number
-            elif line.startswith("%%BeginNonPPDFeature: NumCopies ") :
+            elif line.startswith(r"%%BeginNonPPDFeature: NumCopies ") :
                 # handle # of copies set by some Windows printer driver
                 try :