Changeset 285

Timestamp:

11/15/05 22:02:36 (19 years ago)

Author:

jerome

Message:

Improved PCL3/4/5 parser in corner cases

Files:

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

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -314 +314 @@
         
         if (orientationcount == (pagecount - 1)) and (resets == 1) :
-            self.logdebug("Rule #1")
-            pagecount -= 1
+            if resets == ejects == startgfx == mediasourcecount == escstart == 1 :
+                self.logdebug("Rule #19")
+            else :    
+                self.logdebug("Rule #1")
+                pagecount -= 1
         elif pagecount and (pagecount == orientationcount) :
             self.logdebug("Rule #2")
@@ -345 +348 @@
                 self.logdebug("Rule #11")
                 pagecount = orientationcount
+            elif not pagecount :    
+                self.logdebug("Rule #17")
+                pagecount = ejects
         elif (resets == 1) and (startgfx == endgfx) and (mediasourcecount == 0) :
             if (startgfx > 1) and (startgfx != (pagecount - 1)) :
                 self.logdebug("Rule #12")
                 pagecount -= 1
+            else :    
+                self.logdebug("Rule #18")
         elif startgfx == endgfx :    
             self.logdebug("Rule #13")