Changeset 2459

Timestamp:

09/18/05 00:08:28 (19 years ago)

Author:

jerome

Message:

Did some work to prepare the integration of MaxJobSize? and PassThrough?
mode for printers.

Location:

pykota/trunk/pykota

Files:

• storage.py (modified) (1 diff)
• storages/ldapstorage.py (modified) (6 diffs)
• storages/sql.py (modified) (2 diffs)

pykota/trunk/pykota/storage.py

@@ -150 +150 @@
         self.Description = None
         self.MaxJobSize = None
+        self.PassThrough = None
         self.Coefficients = None
         

pykota/trunk/pykota/storages/ldapstorage.py

@@ -415 +415 @@
         """Extracts printer information given its name : returns first matching printer."""
         printer = StoragePrinter(self, printername)
-        result = self.doSearch("(&(objectClass=pykotaPrinter)(|(pykotaPrinterName=%s)(%s=%s)))" % (printername, self.info["printerrdn"], printername), ["pykotaPrinterName", "pykotaPricePerPage", "pykotaPricePerJob", "uniqueMember", "description"], base=self.info["printerbase"])
+        result = self.doSearch("(&(objectClass=pykotaPrinter)(|(pykotaPrinterName=%s)(%s=%s)))" \
+                      % (printername, self.info["printerrdn"], printername), \
+                        ["pykotaPrinterName", "pykotaPricePerPage", \
+                         "pykotaPricePerJob", "pykotaMaxJobSize", \
+                         "pykotaPassThrough", "uniqueMember", "description"], \
+                      base=self.info["printerbase"])
         if result :
             fields = result[0][1]       # take only first matching printer, ignore the rest
@@ -422 +427 @@
             printer.PricePerJob = float(fields.get("pykotaPricePerJob", [0.0])[0])
             printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0])
+            printer.MaxJobSize = int(fields.get("pykotaMaxJobSize", [0])[0])
+            printer.PassThrough = fields.get("pykotaPassThrough", [None])[0]
+            if printer.PassThrough in (1, "1", "t", "true", "TRUE", "True") :
+                printer.PassThrough = 1
+            else :
+                printer.PassThrough = 0
             printer.uniqueMember = fields.get("uniqueMember", [])
             printer.Description = self.databaseToUserCharset(fields.get("description", [""])[0]) 
@@ -638 +649 @@
         printers = []
         # see comment at the same place in pgstorage.py
-        result = self.doSearch("(&(objectClass=pykotaPrinter)(|%s))" % "".join(["(pykotaPrinterName=%s)(%s=%s)" % (pname, self.info["printerrdn"], pname) for pname in printerpattern.split(",")]), ["pykotaPrinterName", "pykotaPricePerPage", "pykotaPricePerJob", "uniqueMember", "description"], base=self.info["printerbase"])
+        result = self.doSearch("(&(objectClass=pykotaPrinter)(|%s))" % "".join(["(pykotaPrinterName=%s)(%s=%s)" % (pname, self.info["printerrdn"], pname) for pname in printerpattern.split(",")]), ["pykotaPrinterName", "pykotaPricePerPage", "pykotaPricePerJob", "pykotaMaxJobSize", "pykotaPassThrough", "uniqueMember", "description"], base=self.info["printerbase"])
         if result :
             for (printerid, fields) in result :
@@ -646 +657 @@
                 printer.PricePerJob = float(fields.get("pykotaPricePerJob", [0.0])[0] or 0.0)
                 printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0] or 0.0)
+                printer.MaxJobSize = int(fields.get("pykotaMaxJobSize", [0])[0])
+                printer.PassThrough = fields.get("pykotaPassThrough", [None])[0]
+                if printer.PassThrough in (1, "1", "t", "true", "TRUE", "True") :
+                    printer.PassThrough = 1
+                else :
+                    printer.PassThrough = 0
                 printer.uniqueMember = fields.get("uniqueMember", [])
                 printer.Description = self.databaseToUserCharset(fields.get("description", [""])[0]) 
@@ -717 +734 @@
                    "pykotaPricePerPage" : "0.0",
                    "pykotaPricePerJob" : "0.0",
+                   "pykotaMaxJobSize" : "0",
+                   "pykotaPassThrough" : "0",
                  } 
         dn = "%s=%s,%s" % (self.info["printerrdn"], printername, self.info["printerbase"])
@@ -1293 +1312 @@
         entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames(pname)] if p.Exists]
         if entries :
-            result = [ ("dn", "printername", "priceperpage", "priceperjob", "description") ]
+            result = [ ("dn", "printername", "priceperpage", "priceperjob", "description", "maxjobsize", "passthrough") ]
             for entry in entries :
-                result.append((entry.ident, entry.Name, entry.PricePerPage, entry.PricePerJob, entry.Description))
+                if entry.PassThrough in (1, "1", "t", "true", "T", "TRUE", "True") :
+                    passthrough = "t"
+                else :    
+                    passthrough = "f"
+                result.append((entry.ident, entry.Name, entry.PricePerPage, entry.PricePerJob, entry.Description, entry.MaxJobSize, passthrough))
             return result 
         

pykota/trunk/pykota/storages/sql.py

@@ -214 +214 @@
             printer.PricePerJob = fields.get("priceperjob") or 0.0
             printer.PricePerPage = fields.get("priceperpage") or 0.0
+            printer.MaxJobSize = fields.get("maxjobsize") or 0
+            printer.PassThrough = fields.get("passthrough") or 0
+            if printer.PassThrough in (1, "1", "t", "true", "TRUE", "True") :
+                printer.PassThrough = 1
+            else :
+                printer.PassThrough = 0
             printer.Description = self.databaseToUserCharset(fields.get("description") or "")
             printer.Exists = 1
@@ -352 +358 @@
                     printer.PricePerPage = record.get("priceperpage") or 0.0
                     printer.Description = self.databaseToUserCharset(record.get("description") or "") 
+                    printer.MaxJobSize = record.get("maxjobsize") or 0
+                    printer.PassThrough = record.get("passthrough") or 0
+                    if printer.PassThrough in (1, "1", "t", "true", "TRUE", "True") :
+                        printer.PassThrough = 1
+                    else :
+                        printer.PassThrough = 0
                     printer.Exists = 1
                     printers.append(printer)