Changeset 2342 for pykota/trunk/pykota/storage.py

Timestamp:

07/06/05 20:11:00 (19 years ago)

Author:

jerome

Message:

The pkbcodes command line tool now works fine with the PostgreSQL
backend. The dumpykota command can now dump billing codes too.
Still no code for LDAP though.
NB : a database upgrade is necessary AGAIN !
Severity : no need to play with this until there's LDAP support.

Files:

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

pykota/trunk/pykota/storage.py

@@ -431 +431 @@
         self.Exists = 0
         
-    def reset(self, pagecounter=0, balance=0.0) :    
+    def reset(self, balance=0.0, pagecounter=0) :    
         """Resets the pagecounter and balance for this billing code."""
-        self.parent.setBillingCodeValues(self, pagecounter, balance)
+        self.parent.setBillingCodeValues(self, balance, pagecounter)
+        self.Balance = balance
         self.PageCounter = pagecounter
-        self.Balance = balance
         
     def setDescription(self, description=None) :
@@ -464 +464 @@
         if self.usecache :
             self.tool.logdebug("Caching enabled.")
-            self.caches = { "USERS" : {}, "GROUPS" : {}, "PRINTERS" : {}, "USERPQUOTAS" : {}, "GROUPPQUOTAS" : {}, "JOBS" : {}, "LASTJOBS" : {} }
+            self.caches = { "USERS" : {}, "GROUPS" : {}, "PRINTERS" : {}, "USERPQUOTAS" : {}, "GROUPPQUOTAS" : {}, "JOBS" : {}, "LASTJOBS" : {}, "BILLINGCODES" : {} }
         
     def close(self) :    
@@ -539 +539 @@
             self.cacheEntry("LASTJOBS", printer.Name, lastjob)
         return lastjob    
+        
+    def getBillingCode(self, label) :        
+        """Returns the user from cache."""
+        code = self.getFromCache("BILLINGCODES", label)
+        if code is None :
+            code = self.getBillingCodeFromBackend(label)
+            self.cacheEntry("BILLINGCODES", label, code)
+        return code
         
     def getParentPrinters(self, printer) :