Changeset 3549 for pykota/trunk/pykota/storages/sql.py
- Timestamp:
- 08/18/10 04:20:57 (14 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/sql.py
r3541 r3549 62 62 printer.PricePerJob = record.get("priceperjob") or 0.0 63 63 printer.PricePerPage = record.get("priceperpage") or 0.0 64 printer.MaxJobSize = record.get("maxjobsize") or 064 printer.MaxJobSize = record.get("maxjobsize") 65 65 printer.PassThrough = record.get("passthrough") or 0 66 66 if printer.PassThrough in (1, "1", "t", "true", "TRUE", "True") : … … 119 119 userpquota.HardLimit = record.get("hardlimit") 120 120 userpquota.DateLimit = record.get("datelimit") 121 userpquota.MaxJobSize = record.get("maxjobsize") 121 122 userpquota.WarnCount = record.get("warncount") or 0 122 123 userpquota.Exists = True … … 243 244 thefilter = "AND %s" % thefilter 244 245 orderby = self.createOrderBy(["+grouppquota.id"], ordering) 245 result = self.doRawSearch("SELECT groups.groupname,printers.printername,grouppquota.*,coalesce(sum(pagecounter), 0) AS pagecounter,coalesce(sum(lifepagecounter), 0) AS lifepagecounter FROM groups,printers,grouppquota,userpquota WHERE groups.id=grouppquota.groupid AND printers.id=grouppquota.printerid AND userpquota.printerid=grouppquota.printerid AND userpquota.userid IN (SELECT userid FROM groupsmembers WHERE groupsmembers.groupid=grouppquota.groupid) %(thefilter)s GROUP BY grouppquota.id,grouppquota.groupid,grouppquota.printerid,grouppquota.softlimit,grouppquota.hardlimit,grouppquota.datelimit,group pquota.maxjobsize,groups.groupname,printers.printername ORDER BY %(orderby)s" % locals())246 result = self.doRawSearch("SELECT groups.groupname,printers.printername,grouppquota.*,coalesce(sum(pagecounter), 0) AS pagecounter,coalesce(sum(lifepagecounter), 0) AS lifepagecounter FROM groups,printers,grouppquota,userpquota WHERE groups.id=grouppquota.groupid AND printers.id=grouppquota.printerid AND userpquota.printerid=grouppquota.printerid AND userpquota.userid IN (SELECT userid FROM groupsmembers WHERE groupsmembers.groupid=grouppquota.groupid) %(thefilter)s GROUP BY grouppquota.id,grouppquota.groupid,grouppquota.printerid,grouppquota.softlimit,grouppquota.hardlimit,grouppquota.datelimit,groups.groupname,printers.printername ORDER BY %(orderby)s" % locals()) 246 247 return self.prepareRawResult(result) 247 248 … … 560 561 % (self.doQuote(unicodeToDatabase(printer.Name)), \ 561 562 self.doQuote((printer.PassThrough and "t") or "f"), \ 562 self.doQuote(printer.MaxJobSize or 0), \563 self.doQuote(printer.MaxJobSize), \ 563 564 self.doQuote(unicodeToDatabase(printer.Description)), \ 564 565 self.doQuote(printer.PricePerPage or 0.0), \ … … 650 651 if oldentry.Exists : 651 652 return oldentry 652 self.doModify("INSERT INTO grouppquota (groupid, printerid, softlimit, hardlimit, datelimit , maxjobsize) VALUES (%s,%s, %s, %s, %s, %s)" \653 self.doModify("INSERT INTO grouppquota (groupid, printerid, softlimit, hardlimit, datelimit) VALUES (%s, %s, %s, %s, %s)" \ 653 654 % (self.doQuote(gpq.Group.ident), \ 654 655 self.doQuote(gpq.Printer.ident), \ 655 656 self.doQuote(gpq.SoftLimit), \ 656 657 self.doQuote(gpq.HardLimit), \ 657 self.doQuote(gpq.DateLimit), \ 658 self.doQuote(gpq.MaxJobSize))) 658 self.doQuote(gpq.DateLimit))) 659 659 gpq.isDirty = False 660 660 return None # the entry created doesn't need further modification … … 664 664 self.doModify("UPDATE printers SET passthrough=%s, maxjobsize=%s, description=%s, priceperpage=%s, priceperjob=%s WHERE id=%s" \ 665 665 % (self.doQuote((printer.PassThrough and "t") or "f"), \ 666 self.doQuote(printer.MaxJobSize or 0), \666 self.doQuote(printer.MaxJobSize), \ 667 667 self.doQuote(unicodeToDatabase(printer.Description)), \ 668 668 self.doQuote(printer.PricePerPage or 0.0), \