Changeset 2220 for pykota/trunk/pykota/storages/sql.py

Timestamp:

04/28/05 09:20:20 (19 years ago)

Author:

jerome

Message:

Job's billing code is now clicable in the print job
history viewed from the CGI script

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (2 diffs)

pykota/trunk/pykota/storages/sql.py

@@ -498 +498 @@
         self.doModify("DELETE FROM printergroupsmembers WHERE groupid=%s AND printerid=%s" % (self.doQuote(pgroup.ident), self.doQuote(printer.ident)))
         
-    def retrieveHistory(self, user=None, printer=None, datelimit=None, hostname=None, limit=100) :    
+    def retrieveHistory(self, user=None, printer=None, datelimit=None, hostname=None, billingcode=None, limit=100) :
         """Retrieves all print jobs for user on printer (or all) before date, limited to first 100 results."""
         query = "SELECT jobhistory.*,username,printername FROM jobhistory,users,printers WHERE users.id=userid AND printers.id=printerid"
@@ -508 +508 @@
         if hostname is not None :    
             where.append("hostname=%s" % self.doQuote(hostname))
+        if billingcode is not None :    
+            where.append("billingcode=%s" % self.doQuote(self.userCharsetToDatabase(billingcode)))
         if datelimit is not None :    
             where.append("jobdate<=%s" % self.doQuote(datelimit))