Changeset 3056 for pykota/trunk/pykota/storages

Timestamp:

11/13/06 23:24:01 (17 years ago)

Author:

jerome

Message:

The code to refund jobs is there and works (at least with PostgreSQL).
Only the pkrefund command line tool (and CGI script ?) is missing.

Location:

pykota/trunk/pykota/storages

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1303 +1303 @@
             self.doModify(pgroup.ident, fields)         
             
-    def retrieveHistory(self, user=None, printer=None, hostname=None, billingcode=None, limit=100, start=None, end=None) :
+    def retrieveHistory(self, user=None, printer=None, hostname=None, billingcode=None, jobid=None, limit=100, start=None, end=None) :
         """Retrieves all print jobs for user on printer (or all) between start and end date, limited to first 100 results."""
         precond = "(objectClass=pykotaJob)"
@@ -1315 +1315 @@
         if billingcode is not None :
             where.append("(pykotaBillingCode=%s)" % self.userCharsetToDatabase(billingcode))
+        if jobid is not None :
+            where.append("(pykotaJobId=%s)" % jobid) # TODO : jobid is text, so self.userCharsetToDatabase(jobid) but do all of them as well.
         if where :    
             where = "(&%s)" % "".join([precond] + where)
@@ -1778 +1780 @@
         return self.doModify(bcode.ident, fields)         
 
+    def refundJob(self, jobident) :   
+        """Marks a job as refunded in the history."""
+        dn = "cn=%s,%s" % (ident, self.info["jobbase"])
+        fields = {
+                     "pykotaAction" : "REFUND",
+                 }    
+        self.doModify(dn, fields)         
+        
     def storageUserFromRecord(self, username, record) :
         """Returns a StorageUser instance from a database record."""

pykota/trunk/pykota/storages/sql.py

@@ -688 +688 @@
         self.doModify("UPDATE billingcodes SET balance=balance + %s, pagecounter=pagecounter + %s WHERE id=%s" % (self.doQuote(balance), self.doQuote(pagecounter), self.doQuote(bcode.ident)))
        
+    def refundJob(self, jobident) :   
+        """Marks a job as refunded in the history."""
+        self.doModify("UPDATE jobhistory SET action='REFUND' WHERE id=%s;" % self.doQuote(jobident))
+        
     def decreaseUserAccountBalance(self, user, amount) :    
         """Decreases user's account balance from an amount."""
@@ -763 +767 @@
         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, hostname=None, billingcode=None, limit=100, start=None, end=None) :
+    def retrieveHistory(self, user=None, printer=None, hostname=None, billingcode=None, jobid=None, limit=100, start=None, end=None) :
         """Retrieves all print jobs for user on printer (or all) between start and end date, limited to first 100 results."""
         query = "SELECT jobhistory.*,username,printername FROM jobhistory,users,printers WHERE users.id=userid AND printers.id=printerid"
@@ -775 +779 @@
         if billingcode is not None :    
             where.append("billingcode=%s" % self.doQuote(self.userCharsetToDatabase(billingcode)))
+        if jobid is not None :    
+            where.append("jobid=%s" % self.doQuote(jobid)) # TODO : jobid is text, so self.userCharsetToDatabase(jobid) but do all of them as well.
         if start is not None :    
             where.append("jobdate>=%s" % self.doQuote(start))