Changeset 2678
- Timestamp:
- 02/12/06 00:26:31 (19 years ago)
- Location:
- pykota/trunk/pykota/storages
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/ldapstorage.py
r2676 r2678 1633 1633 patterns = billingcodepattern.split(",") 1634 1634 for (codeid, fields) in result : 1635 bcode = self.databaseToUserCharset(fields.get("pykotaBillingCode", [""])[0])1636 if self.tool.matchString( bcode, patterns) :1635 codename = self.databaseToUserCharset(fields.get("pykotaBillingCode", [""])[0]) 1636 if self.tool.matchString(codename, patterns) : 1637 1637 code = StorageBillingCode(self, codename) 1638 1638 code.ident = codeid 1639 code.BillingCode = codename1640 1639 code.PageCounter = int(fields.get("pykotaPageCounter", [0])[0]) 1641 1640 code.Balance = float(fields.get("pykotaBalance", [0.0])[0]) -
pykota/trunk/pykota/storages/sql.py
r2676 r2678 450 450 patterns = billingcodepattern.split(",") 451 451 for record in result : 452 bcode = self.databaseToUserCharset(record["billingcode"])453 if self.tool.matchString( bcode, patterns) :454 code = StorageBillingCode(self, bcode)452 codename = self.databaseToUserCharset(record["billingcode"]) 453 if self.tool.matchString(codename, patterns) : 454 code = StorageBillingCode(self, codename) 455 455 code.ident = record.get("id") 456 456 code.Balance = record.get("balance") or 0.0