Changeset 2217 for pykota/trunk/pykota/storages
- Timestamp:
- 04/24/05 00:01:46 (19 years ago)
- Location:
- pykota/trunk/pykota/storages
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/ldapstorage.py
r2211 r2217 531 531 lastjob.JobHostName = fields.get("pykotaHostName", [""])[0] 532 532 lastjob.JobSizeBytes = fields.get("pykotaJobSizeBytes", [0L])[0] 533 lastjob.JobBillingCode = fields.get("pykotaBillingCode", [None])[0]533 lastjob.JobBillingCode = self.databaseToUserCharset(fields.get("pykotaBillingCode", [None])[0]) 534 534 lastjob.JobMD5Sum = fields.get("pykotaMD5Sum", [None])[0] 535 535 lastjob.JobPages = fields.get("pykotaPages", [""])[0] … … 929 929 self.doModify(lastjob.ident, fields) 930 930 931 def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None, jobprice=None, filename=None, title=None, copies=None, options=None, clienthost=None, jobsizebytes=None, jobmd5sum=None ) :931 def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None, jobprice=None, filename=None, title=None, copies=None, options=None, clienthost=None, jobsizebytes=None, jobmd5sum=None, jobpages=None, jobbilling=None) : 932 932 """Adds a job in a printer's history.""" 933 933 if (not self.disablehistory) or (not printer.LastJob.Exists) : … … 939 939 if self.privacy : 940 940 # For legal reasons, we want to hide the title, filename and options 941 title = filename = options = "Hidden because of privacy concerns"941 title = filename = options = _("Hidden because of privacy concerns") 942 942 fields = { 943 943 "objectClass" : ["pykotaObject", "pykotaJob"], … … 955 955 "pykotaJobSizeBytes" : str(jobsizebytes), 956 956 "pykotaMD5Sum" : str(jobmd5sum), 957 "pykotaPages" : jobpages, # don't add this attribute if it is not set, so no string conversion 958 "pykotaBillingCode" : self.userCharsetToDatabase(jobbilling), # don't add this attribute if it is not set, so no string conversion 957 959 } 958 960 if (not self.disablehistory) or (not printer.LastJob.Exists) : … … 1089 1091 job.JobHostName = fields.get("pykotaHostName", [""])[0] 1090 1092 job.JobSizeBytes = fields.get("pykotaJobSizeBytes", [0L])[0] 1091 job.JobBillingCode = fields.get("pykotaBillingCode", [None])[0]1093 job.JobBillingCode = self.databaseToUserCharset(fields.get("pykotaBillingCode", [None])[0]) 1092 1094 job.JobMD5Sum = fields.get("pykotaMD5Sum", [None])[0] 1093 1095 job.JobPages = fields.get("pykotaPages", [""])[0] -
pykota/trunk/pykota/storages/sql.py
r2147 r2217 255 255 lastjob.JobMD5Sum = fields.get("md5sum") 256 256 lastjob.JobPages = fields.get("pages") 257 lastjob.JobBillingCode = fields.get("billingcode")257 lastjob.JobBillingCode = self.databaseToUserCharset(fields.get("billingcode")) 258 258 lastjob.Exists = 1 259 259 return lastjob … … 450 450 self.doModify("UPDATE jobhistory SET jobsize=%s, jobprice=%s WHERE id=%s" % (self.doQuote(jobsize), self.doQuote(jobprice), self.doQuote(lastjob.ident))) 451 451 452 def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None, jobprice=None, filename=None, title=None, copies=None, options=None, clienthost=None, jobsizebytes=None, jobmd5sum=None ) :452 def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None, jobprice=None, filename=None, title=None, copies=None, options=None, clienthost=None, jobsizebytes=None, jobmd5sum=None, jobpages=None, jobbilling=None) : 453 453 """Adds a job in a printer's history.""" 454 454 if self.privacy : 455 455 # For legal reasons, we want to hide the title, filename and options 456 title = filename = options = "Hidden because of privacy concerns"456 title = filename = options = _("Hidden because of privacy concerns") 457 457 filename = self.userCharsetToDatabase(filename) 458 458 title = self.userCharsetToDatabase(title) 459 459 options = self.userCharsetToDatabase(options) 460 jobbilling = self.userCharsetToDatabase(jobbilling) 460 461 if (not self.disablehistory) or (not printer.LastJob.Exists) : 461 462 if jobsize is not None : 462 self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, jobsize, jobprice, filename, title, copies, options, hostname, jobsizebytes, md5sum ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize), self.doQuote(jobprice), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options), self.doQuote(clienthost), self.doQuote(jobsizebytes), self.doQuote(jobmd5sum)))463 self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, jobsize, jobprice, filename, title, copies, options, hostname, jobsizebytes, md5sum, pages, billingcode) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize), self.doQuote(jobprice), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options), self.doQuote(clienthost), self.doQuote(jobsizebytes), self.doQuote(jobmd5sum), self.doQuote(jobpages), self.doQuote(jobbilling))) 463 464 else : 464 self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, filename, title, copies, options, hostname, jobsizebytes, md5sum ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options), self.doQuote(clienthost), self.doQuote(jobsizebytes), self.doQuote(jobmd5sum)))465 self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, filename, title, copies, options, hostname, jobsizebytes, md5sum, pages, billingcode) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options), self.doQuote(clienthost), self.doQuote(jobsizebytes), self.doQuote(jobmd5sum), self.doQuote(jobpages), self.doQuote(jobbilling))) 465 466 else : 466 467 # here we explicitly want to reset jobsize to NULL if needed 467 self.doModify("UPDATE jobhistory SET userid=%s, jobid=%s, pagecounter=%s, action=%s, jobsize=%s, jobprice=%s, filename=%s, title=%s, copies=%s, options=%s, hostname=%s, jobsizebytes=%s, md5sum=%s, jobdate=now() WHERE id=%s" % (self.doQuote(user.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize), self.doQuote(jobprice), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options), self.doQuote(clienthost), self.doQuote(jobsizebytes), self.doQuote(jobmd5sum), self.doQuote(printer.LastJob.ident)))468 self.doModify("UPDATE jobhistory SET userid=%s, jobid=%s, pagecounter=%s, action=%s, jobsize=%s, jobprice=%s, filename=%s, title=%s, copies=%s, options=%s, hostname=%s, jobsizebytes=%s, md5sum=%s, pages=%s, billingcode=%s, jobdate=now() WHERE id=%s" % (self.doQuote(user.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize), self.doQuote(jobprice), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options), self.doQuote(clienthost), self.doQuote(jobsizebytes), self.doQuote(jobmd5sum), self.doQuote(jobpages), self.doQuote(jobbilling), self.doQuote(printer.LastJob.ident))) 468 469 469 470 def writeUserPQuotaLimits(self, userpquota, softlimit, hardlimit) : … … 534 535 job.JobMD5Sum = fields.get("md5sum") 535 536 job.JobPages = fields.get("pages") 536 job.JobBillingCode = fields.get("billingcode")537 job.JobBillingCode = self.databaseToUserCharset(fields.get("billingcode")) 537 538 job.UserName = fields.get("username") 538 539 job.PrinterName = fields.get("printername")