Changeset 1358 for pykota/trunk/pykota/storages

Timestamp:

02/23/04 23:53:21 (20 years ago)

Author:

jalet

Message:

Don't retrieve data when it's not needed, to avoid database queries

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (5 diffs)
• sql.py (modified) (5 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.55  2004/02/23 22:53:21  jalet
+# Don't retrieve data when it's not needed, to avoid database queries
+#
 # Revision 1.54  2004/02/20 16:38:39  jalet
 # ldapcache directive marked as experimental
@@ -472 +475 @@
             printer.PricePerJob = float(fields.get("pykotaPricePerJob")[0] or 0.0)
             printer.PricePerPage = float(fields.get("pykotaPricePerPage")[0] or 0.0)
-            printer.LastJob = self.getPrinterLastJob(printer)
             printer.uniqueMember = fields.get("uniqueMember", [])
             printer.Exists = 1
@@ -557 +559 @@
                 lastjob.ident = result[0][0]
                 lastjob.JobId = fields.get("pykotaJobId")[0]
-                lastjob.User = self.getUser(fields.get("pykotaUserName")[0])
+                lastjob.UserName = fields.get("pykotaUserName")[0]
                 lastjob.PrinterPageCounter = int(fields.get("pykotaPrinterPageCounter")[0] or 0)
                 lastjob.JobSize = int(fields.get("pykotaJobSize", [0])[0])
@@ -636 +638 @@
                 printer.PricePerPage = float(fields.get("pykotaPricePerPage")[0] or 0.0)
                 printer.uniqueMember = fields.get("uniqueMember", [])
-                printer.LastJob = self.getPrinterLastJob(printer)
                 printer.Exists = 1
                 printers.append(printer)
@@ -993 +994 @@
                 job.JobDate = "%04i-%02i-%02i %02i:%02i:%02i" % (year, month, day, hour, minute, second)
                 if (datelimit is None) or (job.JobDate <= datelimit) :
-                    job.User = self.getUser(fields.get("pykotaUserName")[0])
-                    job.Printer = self.getPrinter(fields.get("pykotaPrinterName")[0])
+                    job.UserName = fields.get("pykotaUserName")[0]
+                    job.PrinterName = fields.get("pykotaPrinterName")[0]
                     job.Exists = 1
                     jobs.append(job)

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.37  2004/02/23 22:53:21  jalet
+# Don't retrieve data when it's not needed, to avoid database queries
+#
 # Revision 1.36  2004/02/04 13:24:41  jalet
 # pkprinters can now remove printers from printers groups.
@@ -92 +95 @@
             printer.PricePerJob = fields.get("priceperjob")
             printer.PricePerPage = fields.get("priceperpage")
-            printer.LastJob = self.getPrinterLastJob(printer)
             printer.Exists = 1
         return printer    
@@ -139 +141 @@
             lastjob.ident = fields.get("id")
             lastjob.JobId = fields.get("jobid")
-            lastjob.User = self.getUser(fields.get("username"))
+            lastjob.UserName = fields.get("username")
             lastjob.PrinterPageCounter = fields.get("pagecounter")
             lastjob.JobSize = fields.get("jobsize")
@@ -204 +206 @@
                     printer.PricePerJob = record.get("priceperjob")
                     printer.PricePerPage = record.get("priceperpage")
-                    printer.LastJob = self.getPrinterLastJob(printer)
                     printer.Exists = 1
                     printers.append(printer)
@@ -391 +392 @@
                 job.JobOptions = fields.get("options")
                 job.JobDate = fields.get("jobdate")
-                job.User = self.getUser(fields.get("username"))
-                job.Printer = self.getPrinter(fields.get("printername"))
+                job.UserName = fields.get("username")
+                job.PrinterName = fields.get("printername")
                 job.Exists = 1
                 jobs.append(job)