Changeset 2369

Timestamp:

07/18/05 16:07:01 (19 years ago)

Author:

jerome

Message:

Ensures that the billing code is stored as an utf8 encoded string.

Files:

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

pykota/trunk/pykota/storages/sql.py

@@ -225 +225 @@
             fields = result[0]
             code.ident = fields.get("id")
-            code.BillingCode = fields.get("billingcode", label)
+            code.BillingCode = self.databaseToUserCharset(fields.get("billingcode", label))
             code.Description = self.databaseToUserCharset(fields.get("description") or "")
             code.Balance = fields.get("balance") or 0.0
@@ -361 +361 @@
         if result :
             for record in result :
-                if self.tool.matchString(record["billingcode"], billingcodepattern.split(",")) :
-                    code = StorageBillingCode(self, record["billingcode"])
+                bcode = self.databaseToUserCharset(record["billingcode"])
+                if self.tool.matchString(bcode, billingcodepattern.split(",")) :
+                    code = StorageBillingCode(self, bcode)
                     code.ident = record.get("id")
                     code.Balance = record.get("balance") or 0.0
@@ -420 +421 @@
     def addBillingCode(self, label) :        
         """Adds a billing code to the quota storage, returns it."""
-        self.doModify("INSERT INTO billingcodes (billingcode) VALUES (%s)" % self.doQuote(label))
+        self.doModify("INSERT INTO billingcodes (billingcode) VALUES (%s)" % self.doQuote(self.userCharsetToDatabase(label)))
         return self.getBillingCode(label)
         
@@ -659 +660 @@
                  ] :  
             self.doModify(q)
-            
-        
+