Changeset 822

Timestamp:

02/27/03 23:40:26 (21 years ago)

Author:

jalet

Message:

Correctly handles cases where the printer is off.

Files:

• pykota/trunk/bin/pykota (modified) (3 diffs)

pykota/trunk/bin/pykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.9  2003/02/27 22:40:26  jalet
+# Correctly handles cases where the printer is off.
+#
 # Revision 1.8  2003/02/09 12:56:53  jalet
 # Internationalization begins...
@@ -108 +111 @@
     
     # Get the page counter directly from the printer itself
-    counterbeforejob = kotafilter.requester.getPrinterPageCounter(kotafilter.printerhostname) # TODO use printername instead, make them match from CUPS' config files
-    
+    try :
+        counterbeforejob = kotafilter.requester.getPrinterPageCounter(kotafilter.printerhostname) # TODO use printername instead, make them match from CUPS' config files
+    except PyKotaRequesterError, msg :
+        # can't get actual page counter, assume printer is off, but warns in log
+        kotafilter.logger.log_message(msg, "warn")
+        printerIsOff = 1
+    else :    
+        printerIsOff = 0
+        
     # Get the last page counter and last username from the Quota Storage backend
     pgc = kotafilter.storage.getPrinterPageCounter(kotafilter.printername)    
@@ -117 +127 @@
         kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername, "warn")
     else :    
+        # get last values from Quota Storage
         (lastpagecounter, lastusername) = (pgc["pagecounter"], pgc["lastusername"])
         
+        # if printer is off then we assume the correct counter value is the last one
+        if printerIsOff :
+            counterbeforejob = lastpagecounter
+            
         # Update the last page counter and last username in the Quota Storage backend
         # set them to current user and