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

Timestamp:

04/24/05 18:16:22 (19 years ago)

Author:

jerome

Message:

The data dumper now supports filtering by hostname
or billing code.

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1037 +1037 @@
             self.doModify(pgroup.ident, fields)         
             
-    def retrieveHistory(self, user=None, printer=None, datelimit=None, hostname=None, limit=100) :    
+    def retrieveHistory(self, user=None, printer=None, datelimit=None, hostname=None, billingcode=None, limit=100) :
         """Retrieves all print jobs for user on printer (or all) before date, limited to first 100 results."""
         precond = "(objectClass=pykotaJob)"
@@ -1047 +1047 @@
         if hostname is not None :
             where.append("(pykotaHostName=%s)" % hostname)
+        if billingcode is not None :
+            where.append("(pykotaBillingCode=%s)" % self.userCharsetToDatabase(billingcode))
         if where :    
             where = "(&%s)" % "".join([precond] + where)
@@ -1326 +1328 @@
         else :    
             printer = None
-        entries = self.retrieveHistory(user, printer, limit=None)
+        entries = self.retrieveHistory(user, printer, hostname=extractonly.get("hostname"), billingcode=extractonly.get("billingcode"), limit=None)
         if entries :
             result = [ ("username", "printername", "dn", "jobid", "pagecounter", "jobsize", "action", "jobdate", "filename", "title", "copies", "options", "jobprice", "hostname", "jobsizebytes", "md5sum", "pages", "billingcode") ]