Changeset 1359 for pykota

Timestamp:

02/25/04 13:36:34 (21 years ago)

Author:

jalet

Message:

Avoids a database query even if caching was disabled.

Location:

pykota/trunk

Files:

• bin/pykota (modified) (2 diffs)
• pykota/storage.py (modified) (3 diffs)

pykota/trunk/bin/pykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.53  2004/02/25 12:36:34  jalet
+# Avoids a database query even if caching was disabled.
+#
 # Revision 1.52  2004/01/14 15:57:54  jalet
 # Missing return caused problems with LPRng
@@ -299 +302 @@
                     lastjobsize = self.accounter.getJobSize()
                     self.logdebug("Last Job size : %i" % lastjobsize)
-                    printer.LastJob.setSize(lastjobsize)
+                    printer.LastJob.setSize(lastuserpquota, lastjobsize)
                     self.logdebug("Updating user %s's quota on printer %s" % (lastuserpquota.User.Name, printer.Name))
                     lastuserpquota.increasePagesUsage(lastjobsize)

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.43  2004/02/25 12:36:34  jalet
+# Avoids a database query even if caching was disabled.
+#
 # Revision 1.42  2004/02/23 22:53:21  jalet
 # Don't retrieve data when it's not needed, to avoid database queries
@@ -428 +431 @@
     def __init__(self, parent, printer) :
         StorageJob.__init__(self, parent)
+        self.PrinterName = printer.Name # not needed
         self.Printer = printer
-        self.UserName = None
         
     def __getattr__(self, name) :    
@@ -439 +442 @@
             raise AttributeError, name
         
-    def setSize(self, jobsize) :
+    def setSize(self, userpquota, jobsize) :
         """Sets the last job's size."""
-        jobprice = self.parent.getUserPQuota(self.User, self.Printer).computeJobPrice(jobsize)
+        jobprice = userpquota.computeJobPrice(jobsize)
         self.parent.writeLastJobSize(self, jobsize, jobprice)
         self.JobSize = jobsize