Changeset 1041 for pykota/trunk/bin/pykota

Timestamp:

06/25/03 16:10:01 (21 years ago)

Author:

jalet

Message:

Hey, it may work (edpykota --reset excepted) !

Files:

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

pykota/trunk/bin/pykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.35  2003/06/25 14:10:01  jalet
+# Hey, it may work (edpykota --reset excepted) !
+#
 # Revision 1.34  2003/06/13 18:54:17  jalet
 # Bug with remote jobs and LPRng fixed.
@@ -239 +242 @@
     
     # Get the last page counter and last username from the Quota Storage backend
-    printerid = kotafilter.storage.getPrinterId(kotafilter.printername)
-    if printerid is None :
+    printer = kotafilter.storage.getPrinter(kotafilter.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
         kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername, "warn")
     else :    
-        userid = kotafilter.storage.getUserId(kotafilter.username)
-        if userid is None :
+        user = kotafilter.storage.getUser(kotafilter.username)
+        if not user.Exists :
             # The user is unknown from the Quota Storage perspective
             # Depending on the default policy for this printer, we
@@ -261 +264 @@
         else :
             # Now does the accounting and act depending on the result
-            action = kotafilter.accounter.doAccounting(printerid, userid)
+            action = kotafilter.accounter.doAccounting(printer, user)
             
             # if not allowed to print then die, else proceed.