Changeset 2676 for pykota/trunk/pykota/storages

Timestamp:

02/12/06 00:05:15 (18 years ago)

Author:

jerome

Message:

The duration for the modification of billing codes has been more than halved.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (2 diffs)
• sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1615 +1615 @@
         return self.getBillingCode(label)
         
-    def writeBillingCodeDescription(self, code) :
+    def saveBillingCode(self, code) :
         """Sets the new description for a billing code."""
         fields = {
                    "description" : self.userCharsetToDatabase(code.Description or ""), 
-                 }
-        if fields["description"] :
-            self.doModify(code.ident, fields)
+                   "pykotaPageCounter" : str(code.PageCounter),
+                   "pykotaBalance" : str(code.Balance),
+                 }
+        self.doModify(code.ident, fields)
             
     def getMatchingBillingCodes(self, billingcodepattern) :
@@ -1645 +1646 @@
         return codes        
         
-    def setBillingCodeValues(self, code, newpagecounter, newbalance) :
-        """Sets the new page counter and balance for a billing code."""
-        fields = {
-                   "pykotaPageCounter" : str(newpagecounter),
-                   "pykotaBalance" : str(newbalance),
-                 }  
-        return self.doModify(code.ident, fields)         
-       
     def consumeBillingCode(self, code, pagecounter, balance) :
         """Consumes from a billing code."""

pykota/trunk/pykota/storages/sql.py

@@ -592 +592 @@
         self.doModify("UPDATE userpquota SET pagecounter=%s, lifepagecounter=%s, warncount=0, datelimit=NULL WHERE id=%s" % (self.doQuote(newpagecounter), self.doQuote(newlifepagecounter), self.doQuote(userpquota.ident)))
        
-    def writeBillingCodeDescription(self, code) :
-        """Sets the new description for a billing code."""
-        self.doModify("UPDATE billingcodes SET description=%s WHERE id=%s" % (self.doQuote(self.userCharsetToDatabase(code.Description or "")), self.doQuote(code.ident)))
-       
-    def setBillingCodeValues(self, code, newpagecounter, newbalance) :    
-        """Sets the new page counter and balance for a billing code."""
-        self.doModify("UPDATE billingcodes SET balance=%s, pagecounter=%s WHERE id=%s" % (self.doQuote(newbalance), self.doQuote(newpagecounter), self.doQuote(code.ident)))
+    def saveBillingCode(self, code) :    
+        """Saves the billing code to the database."""
+        self.doModify("UPDATE billingcodes SET balance=%s, pagecounter=%s, description=%s WHERE id=%s" \
+                            % (self.doQuote(code.Balance), \
+                               self.doQuote(code.PageCounter), \
+                               self.doQuote(self.userCharsetToDatabase(code.Description)), \
+                               self.doQuote(code.ident)))
        
     def consumeBillingCode(self, code, pagecounter, balance) :