Changeset 543 for pkpgcounter/trunk

Show
Ignore:
Timestamp:
12/09/07 11:25:35 (16 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:
1 modified

Legend:

Unmodified
Added
Removed
  • pkpgcounter/trunk/pkpgpdls/pcl345.py

    r541 r543  
    470470        self.logdebug("MediaSources : \t\t\t%s" % self.mediasourcesvalues) 
    471471        nbmediasourcesdefault = len([m for m in self.mediasourcesvalues if m == 'Default']) 
     472        nbmediasourcesnotdefault = len(self.mediasourcesvalues) - nbmediasourcesdefault 
    472473        self.logdebug("MediaSourcesDefault : \t\t%i" % nbmediasourcesdefault) 
    473         self.logdebug("MediaSourcesNOTDefault : \t%i" % (len(self.mediasourcesvalues) - nbmediasourcesdefault)) 
     474        self.logdebug("MediaSourcesNOTDefault : \t%i" % nbmediasourcesnotdefault) 
    474475        self.logdebug("Orientations : \t\t\t%s" % self.orientationsvalues) 
    475476        nborientations = len(self.orientationsvalues) 
     
    482483         
    483484        if self.isimagerunner : 
     485            self.logdebug("Adjusting PageCount : +1") 
    484486            self.pagecount += 1      # ImageRunner adjustment 
    485487        elif self.linesperpage is not None :     
     488            self.logdebug("Adjusting PageCount : +1") 
    486489            self.pagecount += 1      # Adjusts for incomplete last page 
    487490        elif len(self.startgfx) == len(self.endgfx) == 0 : 
     
    490493                    self.logdebug("Adjusting PageCount : +1") 
    491494                    self.pagecount += 1 
    492                 elif nborientations == self.pagecount - 1 : 
     495                elif (self.pagecount > 1) \ 
     496                     and (nborientations == self.pagecount - 1) : 
    493497                    self.logdebug("Adjusting PageCount : -1") 
    494498                    self.pagecount -= 1 
     499        elif (self.pagecount > 1) \ 
     500             and (self.resets == 2) \ 
     501             and (not nbmediasourcesdefault) \ 
     502             and (nbmediasourcesnotdefault == 1) : 
     503            self.logdebug("Adjusting PageCount : -1") 
     504            self.pagecount -= 1 
    495505                     
    496506        self.pagecount = self.pagecount or nbmediasourcesdefault