Changeset 2358 for pykota/trunk/pykota/storages/ldapstorage.py

Timestamp:

07/11/05 23:12:27 (19 years ago)

Author:

jerome

Message:

More work done on billing codes + LDAP.
Severity: minor.

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1206 +1206 @@
                 
     def deletePrinter(self, printer) :    
-        """Completely deletes an user from the Quota Storage."""
+        """Completely deletes a printer from the Quota Storage."""
         result = self.doSearch("(&(objectClass=pykotaLastJob)(pykotaPrinterName=%s))" % printer.Name, base=self.info["lastjobbase"])
         for (ident, fields) in result :
@@ -1239 +1239 @@
         self.doDelete(printer.ident)    
         
+    def deleteBillingCode(self, code) :
+        """Deletes a billing code from the Quota Storage (no entries are deleted from the history)"""
+        self.doDelete(code.ident)
+        
     def extractPrinters(self, extractonly={}) :
         """Extracts all printer records."""
@@ -1257 +1261 @@
             for entry in entries :
                 result.append((entry.ident, entry.Name, entry.AccountBalance, entry.LifeTimePaid, entry.LimitBy, entry.Email))
+            return result 
+        
+    def extractBillingcodes(self, extractonly={}) :
+        """Extracts all billing codes records."""
+        billingcode = extractonly.get("billingcode")
+        entries = [b for b in [self.getBillingCode(label) for label in self.getAllBillingCodes(billingcode)] if b.Exists]
+        if entries :
+            result = [ ("dn", "billingcode", "balance", "pagecounter", "description") ]
+            for entry in entries :
+                result.append((entry.ident, entry.BillingCode, entry.Balance, entry.PageCounter, entry.Description))
             return result 
         
@@ -1350 +1364 @@
             for entry in entries :
                 result.append((entry.UserName, entry.PrinterName, entry.ident, entry.JobId, entry.PrinterPageCounter, entry.JobSize, entry.JobAction, entry.JobDate, entry.JobFileName, entry.JobTitle, entry.JobCopies, entry.JobOptions, entry.JobPrice, entry.JobHostName, entry.JobSizeBytes, entry.JobMD5Sum, entry.JobPages, entry.JobBillingCode)) 
-            return result    
+            return result
+            
+            
+# def getBillingCodeFromBackend(self, label) :        
+# def getMatchingBillingCodes(self, billingcodepattern) :
+# def addBillingCode(self, label) :        
+# def writeBillingCodeDescription(self, code) :
+# def setBillingCodeValues(self, code, newbalance, newpagecounter) :    
+# def consumeBillingCode(self, code, balance, pagecounter) :
+