Changeset 900 for pykota/trunk/pykota/tool.py

Timestamp:

04/10/03 23:47:20 (21 years ago)

Author:

jalet

Message:

Job history added. Upgrade script neutralized for now !

Files:

• pykota/trunk/pykota/tool.py (modified) (3 diffs)

pykota/trunk/pykota/tool.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.30  2003/04/10 21:47:20  jalet
+# Job history added. Upgrade script neutralized for now !
+#
 # Revision 1.29  2003/03/29 13:45:27  jalet
 # GPL paragraphs were incorrectly (from memory) copied into the sources.
@@ -276 +279 @@
     def checkUserPQuota(self, username, printername) :
         """Checks the user quota on a printer and deny or accept the job."""
-        quota = self.storage.getUserPQuota(username, printername)
+        printerid = self.storage.getPrinterId(printername)
+        userid = self.storage.getUserId(username)
+        quota = self.storage.getUserPQuota(userid, printerid)
         if quota is None :
             # Unknown user or printer or combination
@@ -304 +309 @@
                             else :
                                 datelimit = now + self.config.getGraceDelay(printername)
-                                self.storage.setDateLimit(username, printername, datelimit)
+                                self.storage.setUserDateLimit(userid, printerid, datelimit)
                             if now < datelimit :
                                 action = "WARN"