Changeset 2375

Timestamp:

07/18/05 18:52:19 (19 years ago)

Author:

jerome

Message:

More work done on LDAP + billing codes.

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -846 +846 @@
         """Write the printer's description back into the storage."""
         fields = {
-                   "description" : self.userCharsetToDatabase(str(printer.Description)), 
-                 }
-        self.doModify(printer.ident, fields)
+                   "description" : self.userCharsetToDatabase(printer.Description or ""),
+                 }
+        if fields["description"] :
+            self.doModify(printer.ident, fields)
         
     def writeUserOverCharge(self, user, factor) :
@@ -1369 +1370 @@
         """Extracts billing code information given its label : returns first matching billing code."""
         code = StorageBillingCode(self, label)
-        result = self.doSearch("(&(objectClass=pykotaBilling)(pykotaBillingCode=%s))" % label, ["pykotaBillingCode", "pykotaBalance", "pykotaPageCounter", "description"], base=self.info["billingcodebase"])
+        ulabel = self.userCharsetToDatabase(label)
+        result = self.doSearch("(&(objectClass=pykotaBilling)(pykotaBillingCode=%s))" % ulabel, ["pykotaBillingCode", "pykotaBalance", "pykotaPageCounter", "description"], base=self.info["billingcodebase"])
         if result :
             fields = result[0][1]       # take only first matching code, ignore the rest
             code.ident = result[0][0]
-            code.BillingCode = self.databaseToUserCharset(fields.get("pykotaBillingCode", [self.userCharsetToDatabase(label)])[0])
+            code.BillingCode = self.databaseToUserCharset(fields.get("pykotaBillingCode", [ulabel])[0])
             code.PageCounter = int(fields.get("pykotaPageCounter", [0])[0])
             code.Balance = float(fields.get("pykotaBalance", [0.0])[0])
@@ -1379 +1381 @@
             code.Exists = 1
         return code    
-            
-# def getBillingCodeFromBackend(self, label) :        
+        
+    def addBillingCode(self, label) :
+        """Adds a billing code to the quota storage, returns it."""
+        uuid = self.genUUID()
+        dn = "cn=%s,%s" % (uuid, self.info["billingcodebase"])
+        fields = { "objectClass" : ["pykotaObject", "pykotaBilling"],
+                   "cn" : uuid,
+                   "pykotaBillingCode" : self.userCharsetToDatabase(label),
+                   "pykotaPageCounter" : "0",
+                   "pykotaBalance" : "0.0",
+                 } 
+        self.doAdd(dn, fields)
+        return self.getBillingCode(label)
+        
+    def writeBillingCodeDescription(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)
+            
 # def getMatchingBillingCodes(self, billingcodepattern) :
-# def addBillingCode(self, label) :        
 # def writeBillingCodeDescription(self, code) :
 # def setBillingCodeValues(self, code, newbalance, newpagecounter) :