Changeset 3541

Timestamp:

04/22/10 11:13:59 (15 years ago)

Author:

jerome

Message:

I've finally killed this one (exactly the sort of thing I've said for
several years wrt such charset encoding problems) ! The problem was not
in the encoding of the title attribute of the job, which was perfectly
correct, but in the jobid attribute, which was still in unicode instead
of in UTF-8. This particular situation made the query string be
transformed to unicode, and an utf-8 encoded title couldn't be inserted
into it, making PyKota fail miserably.
Fixes #56. References #60, #61.

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (5 diffs)

pykota/trunk/pykota/storages/sql.py

@@ -75 +75 @@
         """Sets the attributes of a job from a database record."""
         job.ident = record.get("id")
-        job.JobId = record.get("jobid")
+        job.JobId = databaseToUnicode(record.get("jobid"))
         job.PrinterPageCounter = record.get("pagecounter")
         job.JobSize = record.get("jobsize")
@@ -741 +741 @@
                                   % (self.doQuote(user.ident),
                                      self.doQuote(printer.ident),
-                                     self.doQuote(jobid),
+                                     self.doQuote(unicodeToDatabase(jobid)),
                                      self.doQuote(pagecounter),
                                      self.doQuote(action),
@@ -761 +761 @@
                                   % (self.doQuote(user.ident),
                                      self.doQuote(printer.ident),
-                                     self.doQuote(jobid),
+                                     self.doQuote(unicodeToDatabase(jobid)),
                                      self.doQuote(pagecounter),
                                      self.doQuote(action),
@@ -779 +779 @@
             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, precomputedjobsize=%s, precomputedjobprice=%s, jobdate=now() WHERE id=%s" \
                               % (self.doQuote(user.ident),
-                                 self.doQuote(jobid),
+                                 self.doQuote(unicodeToDatabase(jobid)),
                                  self.doQuote(pagecounter),
                                  self.doQuote(action),
@@ -855 +855 @@
             where.append("billingcode=%s" % self.doQuote(unicodeToDatabase(billingcode)))
         if jobid is not None :
-            where.append("jobid=%s" % self.doQuote(jobid)) # TODO : jobid is text, so unicodeToDatabase(jobid) but do all of them as well.
+            where.append("jobid=%s" % self.doQuote(unicodeToDatabase(jobid)))
         if start is not None :
             where.append("jobdate>=%s" % self.doQuote(start))