Changeset 543 for pkpgcounter/trunk

Timestamp:

12/09/07 11:25:35 (17 years ago)

Author:

jerome

Message:

Pagecount adjustments for corner cases : makes hpijs/DJ350 and hpijs/DJ630
parsers found one page less than original, but makes more hpijs outputs
succeed. Not enough discriminant datas to make them work for all...

Files:

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

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -470 +470 @@
         self.logdebug("MediaSources : \t\t\t%s" % self.mediasourcesvalues)
         nbmediasourcesdefault = len([m for m in self.mediasourcesvalues if m == 'Default'])
+        nbmediasourcesnotdefault = len(self.mediasourcesvalues) - nbmediasourcesdefault
         self.logdebug("MediaSourcesDefault : \t\t%i" % nbmediasourcesdefault)
-        self.logdebug("MediaSourcesNOTDefault : \t%i" % (len(self.mediasourcesvalues) - nbmediasourcesdefault))
+        self.logdebug("MediaSourcesNOTDefault : \t%i" % nbmediasourcesnotdefault)
         self.logdebug("Orientations : \t\t\t%s" % self.orientationsvalues)
         nborientations = len(self.orientationsvalues)
@@ -482 +483 @@
         
         if self.isimagerunner :
+            self.logdebug("Adjusting PageCount : +1")
             self.pagecount += 1      # ImageRunner adjustment
         elif self.linesperpage is not None :    
+            self.logdebug("Adjusting PageCount : +1")
             self.pagecount += 1      # Adjusts for incomplete last page
         elif len(self.startgfx) == len(self.endgfx) == 0 :
@@ -490 +493 @@
                     self.logdebug("Adjusting PageCount : +1")
                     self.pagecount += 1
-                elif nborientations == self.pagecount - 1 :
+                elif (self.pagecount > 1) \
+                     and (nborientations == self.pagecount - 1) :
                     self.logdebug("Adjusting PageCount : -1")
                     self.pagecount -= 1
+        elif (self.pagecount > 1) \
+             and (self.resets == 2) \
+             and (not nbmediasourcesdefault) \
+             and (nbmediasourcesnotdefault == 1) :
+            self.logdebug("Adjusting PageCount : -1")
+            self.pagecount -= 1
                     
         self.pagecount = self.pagecount or nbmediasourcesdefault