Changeset 2686 for pykota/trunk/pykota/storages

Timestamp:

02/12/06 13:32:53 (18 years ago)

Author:

jerome

Message:

Modified pkprinters to improve speed just like I did for pkbcodes earlier.
edpykota had to be modified as well to use the new printer API.
The time spent to modify printers has been almost halved.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (1 diff)
• sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1017 +1017 @@
         return self.getGroupPQuota(group, printer)
         
-    def writePrinterPrices(self, printer) :    
-        """Write the printer's prices back into the storage."""
+    def savePrinter(self, printer) :    
+        """Saves the printer to the database in a single operation."""
         fields = {
+                   "pykotaPassThrough" : (printer.PassThrough and "t") or "f",
+                   "pykotaMaxJobSize" : (printer.MaxJobSize and str(printer.MaxJobSize)) or "0",
+                   "description" : self.userCharsetToDatabase(printer.Description or ""),
                    "pykotaPricePerPage" : str(printer.PricePerPage),
                    "pykotaPricePerJob" : str(printer.PricePerJob),
-                 }
-        self.doModify(printer.ident, fields)
-        
-    def writePrinterDescription(self, printer) :    
-        """Write the printer's description back into the storage."""
-        fields = {
-                   "description" : self.userCharsetToDatabase(printer.Description or ""),
-                 }
-        if fields["description"] :
-            self.doModify(printer.ident, fields)
-            
-    def setPrinterMaxJobSize(self, printer, maxjobsize) :     
-        """Write the printer's maxjobsize attribute."""
-        fields = {
-                   "pykotaMaxJobSize" : (maxjobsize and str(maxjobsize)) or "0",
-                 }
-        self.doModify(printer.ident, fields)
-        
-    def setPrinterPassThroughMode(self, printer, passthrough) :
-        """Write the printer's passthrough attribute."""
-        fields = {
-                   "pykotaPassThrough" : (passthrough and "t") or "f",
                  }
         self.doModify(printer.ident, fields)

pykota/trunk/pykota/storages/sql.py

@@ -547 +547 @@
         return self.getGroupPQuota(group, printer)
         
-    def writePrinterPrices(self, printer) :    
-        """Write the printer's prices back into the storage."""
-        self.doModify("UPDATE printers SET priceperpage=%s, priceperjob=%s WHERE id=%s" % (self.doQuote(printer.PricePerPage), self.doQuote(printer.PricePerJob), self.doQuote(printer.ident)))
-        
-    def writePrinterDescription(self, printer) :    
-        """Write the printer's description back into the storage."""
-        description = self.userCharsetToDatabase(printer.Description)
-        self.doModify("UPDATE printers SET description=%s WHERE id=%s" % (self.doQuote(description), self.doQuote(printer.ident)))
-        
-    def setPrinterMaxJobSize(self, printer, maxjobsize) :     
-        """Write the printer's maxjobsize attribute."""
-        self.doModify("UPDATE printers SET maxjobsize=%s WHERE id=%s" % (self.doQuote(maxjobsize), self.doQuote(printer.ident)))
-        
-    def setPrinterPassThroughMode(self, printer, passthrough) :
-        """Write the printer's passthrough attribute."""
-        self.doModify("UPDATE printers SET passthrough=%s WHERE id=%s" % (self.doQuote((passthrough and "t") or "f"), self.doQuote(printer.ident)))
+    def savePrinter(self, printer) :    
+        """Saves the printer to the database in a single operation."""
+        self.doModify("UPDATE printers SET passthrough=%s, maxjobsize=%s, description=%s, priceperpage=%s, priceperjob=%s WHERE id=%s" \
+                              % (self.doQuote((printer.PassThrough and "t") or "f"), \
+                                 self.doQuote(printer.MaxJobSize), \
+                                 self.doQuote(self.userCharsetToDatabase(printer.Description)), \
+                                 self.doQuote(printer.PricePerPage), \
+                                 self.doQuote(printer.PricePerJob), \
+                                 self.doQuote(printer.ident)))
         
     def writeUserOverCharge(self, user, factor) :