Changeset 2388 for pykota/trunk/pykota/storages

Timestamp:

07/27/05 15:17:28 (19 years ago)

Author:

jerome

Message:

Fixed an LDAP filtering problem when several billing codes were passed on pkbcodes' command line.
The unknown_billingcode directive now works as expected.
The billing code's page counter and balance are updated when printing.
Severity : If you need full management of billing codes, this is for you.

Location:

pykota/trunk/pykota/storages

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1420 +1420 @@
         """Returns the list of all billing codes which match a certain pattern."""
         codes = []
-        result = self.doSearch("(&(objectClass=pykotaBilling)%s)" % "".join(["(pykotaBillingCode=%s)" % self.userCharsetToDatabase(bcode) for bcode in billingcodepattern.split(",")]), \
+        result = self.doSearch("(&(objectClass=pykotaBilling)(|%s))" % "".join(["(pykotaBillingCode=%s)" % self.userCharsetToDatabase(bcode) for bcode in billingcodepattern.split(",")]), \
                                 ["pykotaBillingCode", "description", "pykotaPageCounter", "pykotaBalance"], \
                                 base=self.info["billingcodebase"])
@@ -1437 +1437 @@
         return codes        
         
-    def setBillingCodeValues(self, code, newbalance, newpagecounter) :    
+    def setBillingCodeValues(self, code, newpagecounter, newbalance) :
         """Sets the new page counter and balance for a billing code."""
         fields = {
@@ -1445 +1445 @@
         return self.doModify(code.ident, fields)         
        
-    def consumeBillingCode(self, code, balance, pagecounter) :
+    def consumeBillingCode(self, code, pagecounter, balance) :
         """Consumes from a billing code."""
         fields = {

pykota/trunk/pykota/storages/sql.py

@@ -495 +495 @@
         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, newbalance, newpagecounter) :    
+    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 consumeBillingCode(self, code, balance, pagecounter) :
+    def consumeBillingCode(self, code, pagecounter, balance) :
         """Consumes from a billing code."""
         self.doModify("UPDATE billingcodes SET balance=balance + %s, pagecounter=pagecounter + %s WHERE id=%s" % (self.doQuote(balance), self.doQuote(pagecounter), self.doQuote(code.ident)))