Changeset 2027

Timestamp:

01/12/05 23:44:06 (19 years ago)

Author:

jalet

Message:

Tried to fix a problem with printers which are slow to pass into printing mode.

Files:

• pykota/trunk/pykota/accounters/hardware.py (modified) (5 diffs)

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.35  2005/01/12 22:44:06  jalet
+# Tried to fix a problem with printers which are slow to pass into printing mode.
+#
 # Revision 1.34  2004/11/19 11:57:51  jalet
 # Modified the SNMP fix as hinted by pysnmp's maintainer
@@ -221 +224 @@
                 self.retrieveSNMPValues()
                 statusAsString = printerStatusValues.get(self.printerStatus)
-                if statusAsString in ('idle', 'printing') :
+                if statusAsString in ('printing',) :
                     break
-                self.parent.filter.logdebug(_("Waiting for printer %s to be idle or printing...") % self.parent.filter.printername)    
+                self.parent.filter.logdebug(_("Waiting for printer %s to be printing...") % self.parent.filter.printername)    
                 time.sleep(ITERATIONDELAY)
             
@@ -311 +314 @@
         while 1:
             self.retrievePJLValues()
-            if self.printerStatus in ('10000', '10001', '10023', '35078') :
+            if self.printerStatus in ('10023',) :
                 break
-            self.parent.filter.logdebug(_("Waiting for printer %s to be idle or printing...") % self.parent.filter.printername)
+            self.parent.filter.logdebug(_("Waiting for printer %s to be printing...") % self.parent.filter.printername)
             time.sleep(ITERATIONDELAY)
         
@@ -474 +477 @@
             if (os.environ.get("PYKOTASTATUS") != "CANCELLED") and \
                (os.environ.get("PYKOTAACTION") != "DENY") and \
-               (os.environ.get("PYKOTAPHASE") == "AFTER") :
+               (os.environ.get("PYKOTAPHASE") == "AFTER") and \
+               self.filter.jobSizeBytes :
                 acc.waitPrinting()
             acc.waitIdle()    
@@ -490 +494 @@
             if (os.environ.get("PYKOTASTATUS") != "CANCELLED") and \
                (os.environ.get("PYKOTAACTION") != "DENY") and \
-               (os.environ.get("PYKOTAPHASE") == "AFTER") :
+               (os.environ.get("PYKOTAPHASE") == "AFTER") and \
+               self.filter.jobSizeBytes :
                 acc.waitPrinting()
             acc.waitIdle()