Changeset 1221 for pykota/trunk/bin/pykota

Timestamp:

11/26/03 20:17:35 (20 years ago)

Author:

jalet

Message:

Printing on a printer not present in the Quota Storage now results
in the job being stopped or cancelled depending on the system.

Files:

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

pykota/trunk/bin/pykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.47  2003/11/26 19:17:35  jalet
+# Printing on a printer not present in the Quota Storage now results
+# in the job being stopped or cancelled depending on the system.
+#
 # Revision 1.46  2003/11/24 14:25:02  jalet
 # Missing import in pykota filter
@@ -231 +235 @@
     printer = thefilter.storage.getPrinter(thefilter.printername)
     if not printer.Exists :
-        # The printer is unknown from the Quota Storage perspective
-        # we let the job pass through, but log a warning message
-        thefilter.logger.log_message(_("Printer %s not registered in the PyKota system") % thefilter.printername, "warn")
+        # The printer is unknown from the Quota Storage perspective.
+        # we just cancel the job.
+        thefilter.logger.log_message(_("Printer %s not registered in the PyKota system") % thefilter.printername, "error")
+        return thefilter.removeJob()
     else :    
         for dummy in range(2) :
@@ -279 +284 @@
             return thefilter.removeJob()
         
-    # pass the job untouched to the underlying layer
-    thefilter.accounter.filterInput(thefilter.inputfile)      
+        # pass the job untouched to the underlying layer
+        thefilter.accounter.filterInput(thefilter.inputfile)      
     
-    return thefilter.acceptJob()
+        return thefilter.acceptJob()
 
 if __name__ == "__main__" :