Changeset 2380

Timestamp:

07/21/05 13:59:45 (19 years ago)

Author:

jerome

Message:

Adding, deleting, or listing billing codes now works with LDAP too (finally !)
Only modifying the counters and balance is not done yet.
Severity : be patient, all should be fine before August 1st :-)

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -36 +36 @@
 from mx import DateTime
 
-from pykota.storage import PyKotaStorageError, BaseStorage, StorageObject, StorageUser, StorageGroup, StoragePrinter, StorageJob, StorageLastJob, StorageUserPQuota, StorageGroupPQuota
+from pykota.storage import PyKotaStorageError, BaseStorage, StorageObject, \
+                           StorageUser, StorageGroup, StoragePrinter, \
+                           StorageJob, StorageLastJob, StorageUserPQuota, \
+                           StorageGroupPQuota, StorageBillingCode
 
 try :
@@ -1403 +1406 @@
             self.doModify(code.ident, fields)
             
-# def getMatchingBillingCodes(self, billingcodepattern) :
-# def writeBillingCodeDescription(self, code) :
+    def getMatchingBillingCodes(self, billingcodepattern) :
+        """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(",")]), \
+                                ["pykotaBillingCode", "description", "pykotaPageCounter", "pykotaBalance"], \
+                                base=self.info["billingcodebase"])
+        if result :
+            for (codeid, fields) in result :
+                codename = self.databaseToUserCharset(fields.get("pykotaBillingCode", [""])[0])
+                code = StorageBillingCode(self, codename)
+                code.ident = codeid
+                code.BillingCode = codename
+                code.PageCounter = int(fields.get("pykotaPageCounter", [0])[0])
+                code.Balance = float(fields.get("pykotaBalance", [0.0])[0])
+                code.Description = self.databaseToUserCharset(fields.get("description", [""])[0]) 
+                code.Exists = 1
+                codes.append(code)
+                self.cacheEntry("BILLINGCODES", code.BillingCode, code)
+        return codes        
+        
 # def setBillingCodeValues(self, code, newbalance, newpagecounter) :    
 # def consumeBillingCode(self, code, balance, pagecounter) :