Changeset 2775

Timestamp:

03/02/06 17:39:29 (18 years ago)

Author:

jerome

Message:

Fixed billing code extraction : it didn't have the speed improvements
that was added to printers, users and groups.

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/sql.py

@@ -470 +470 @@
         if result :
             patterns = billingcodepattern.split(",")
+            try :
+                patdict = {}.fromkeys(patterns)
+            except AttributeError :    
+                # Python v2.2 or earlier
+                patdict = {}
+                for p in patterns :
+                    patdict[p] = None
             for record in result :
                 codename = self.databaseToUserCharset(record["billingcode"])
-                if self.tool.matchString(codename, patterns) :
+                if patdict.has_key(codename) or self.tool.matchString(codename, patterns) :
                     code = StorageBillingCode(self, codename)
                     code.ident = record.get("id")