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

Timestamp:

11/28/07 11:13:33 (16 years ago)

Author:

jerome

Message:

Finally we need to duplicate some datas, since for some file formats (e.g. mstrash)
a preliminary conversion will have to be done (through wvware for example) and we
would need to overwrite original values, which is not desirable.

Files:

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

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -37 +37 @@
     def isValid(self) :    
         """Returns True if data is PostScript, else False."""
-        if self.parent.firstblock.startswith("%!") or \
-           self.parent.firstblock.startswith("\004%!") or \
-           self.parent.firstblock.startswith("\033%-12345X%!PS") or \
-           ((self.parent.firstblock[:128].find("\033%-12345X") != -1) and \
-             ((self.parent.firstblock.find("LANGUAGE=POSTSCRIPT") != -1) or \
-              (self.parent.firstblock.find("LANGUAGE = POSTSCRIPT") != -1) or \
-              (self.parent.firstblock.find("LANGUAGE = Postscript") != -1))) or \
-              (self.parent.firstblock.find("%!PS-Adobe") != -1) :
+        if self.firstblock.startswith("%!") or \
+           self.firstblock.startswith("\004%!") or \
+           self.firstblock.startswith("\033%-12345X%!PS") or \
+           ((self.firstblock[:128].find("\033%-12345X") != -1) and \
+             ((self.firstblock.find("LANGUAGE=POSTSCRIPT") != -1) or \
+              (self.firstblock.find("LANGUAGE = POSTSCRIPT") != -1) or \
+              (self.firstblock.find("LANGUAGE = Postscript") != -1))) or \
+              (self.firstblock.find("%!PS-Adobe") != -1) :
             self.logdebug("DEBUG: Input file is in the PostScript format.")
             return True
@@ -53 +53 @@
         """Get the count through GhostScript, useful for non-DSC compliant PS files."""
         self.logdebug("Internal parser sucks, using GhostScript instead...")
-        infname = self.parent.filename
+        infname = self.filename
         command = 'gs -sDEVICE=bbox -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET "%(infname)s" 2>&1 | grep -c "%%HiResBoundingBox:" 2>/dev/null'
         pagecount = 0