Changeset 2218

Timestamp:

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

Author:

jerome

Message:

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

Location:

pykota/trunk

Files:

• bin/dumpykota (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/dumper.py (modified) (3 diffs)
• pykota/storages/ldapstorage.py (modified) (3 diffs)
• pykota/storages/sql.py (modified) (1 diff)

pykota/trunk/bin/dumpykota

@@ -88 +88 @@
          printername    Printer's name
          pgroupname     Printers group's name
+         hostname       Client's hostname
+         billingcode    Job's billing code
          
   Contrary to other PyKota management tools, wildcard characters are not 

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.22alpha8 :
     
+        - The data dumper now accepts billingcode= and hostname= as
+          filters when dumping the job history.
+          
         - The job billing code if present is now saved into the database,
           and exported to subprocesses as the PYKOTAJOBBILLING environment

pykota/trunk/pykota/dumper.py

@@ -61 +61 @@
                         "printername",
                         "pgroupname",
+                        "hostname",
+                        "billingcode",
                       ]
     def main(self, arguments, options, restricted=1) :
@@ -75 +77 @@
                         raise ValueError                
                 except ValueError :    
-                    raise PyKotaToolError, _("Invalid value [%s] for --filter command line option, see help.") % filterexp
+                    raise PyKotaToolError, _("Invalid filter value [%s], see help.") % filterexp
                 else :    
                     extractonly.update({ filterkey : filtervalue })
@@ -91 +93 @@
             raise PyKotaToolError, _("XML output is disabled because the jaxml module is not available.")
             
-        entries = getattr(self.storage, "extract%s" % datatype.title())(extractonly)    
+        entries = getattr(self.storage, "extract%s" % datatype.title())(extractonly)
         if entries :
             mustclose = 0    

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") ] 

pykota/trunk/pykota/storages/sql.py

@@ -47 +47 @@
             expressions = []
             for (k, v) in only.items() :
-                expressions.append("%s=%s" % (k, self.doQuote(v)))
+                expressions.append("%s=%s" % (k, self.doQuote(self.userCharsetToDatabase(v))))
             return " AND ".join(expressions)     
         return ""