Changeset 216 for pkpgcounter/trunk

Timestamp:

06/30/05 14:31:35 (19 years ago)

Author:

jerome

Message:

Added support for the DVI format

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pdlanalyzer/analyzer.py (modified) (4 diffs)
• pdlanalyzer/dvi.py (added)
• pdlanalyzer/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
    
+  * 1.51 : 
+  
+    - Basic support for the DVI format.
+    
   * 1.50 :
   

pkpgcounter/trunk/pdlanalyzer/analyzer.py

@@ -23 +23 @@
 import tempfile
 
-from pdlanalyzer import version, pdlparser, postscript, pdf, pcl345, pclxl, escp2
+from pdlanalyzer import version, pdlparser, postscript, pdf, pcl345, pclxl, escp2, dvi
 
 KILOBYTE = 1024    
@@ -57 +57 @@
             psyco.bind(pcl345.PCL345Parser.getJobSize)
             psyco.bind(pclxl.PCLXLParser.getJobSize)
+            psyco.bind(dvi.DVIParser.getJobSize)
         
     def getJobSize(self) :    
@@ -172 +173 @@
             if self.debug :  
                 sys.stderr.write("%s is an ESC/P2 file\n" % str(self.filename))
+            return 1
+        else :    
+            return 0
+            
+    def isDVI(self, sdata, edata) :        
+        """Returns 1 if data is DVI, else 0."""
+        if (ord(sdata[0]) == 0xf7) and (ord(edata[-1]) == 0xdf) :
+            if self.debug :  
+                sys.stderr.write("%s is an DVI file\n" % str(self.filename))
             return 1
         else :    
@@ -200 +210 @@
         elif self.isESCP2(firstblock, lastblock) :    
             return escp2.ESCP2Parser
+        elif self.isDVI(firstblock, lastblock) :    
+            return dvi.DVIParser
         else :    
             raise pdlparser.PDLParserError, "Analysis of first data block failed."

pkpgcounter/trunk/pdlanalyzer/version.py

@@ -20 +20 @@
 #
 
-__version__ = "1.50"
+__version__ = "1.51"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""