Merged kfsone/tradedangerous into master

Author: maddavo

CHANGES.txt

@@ -2,6 +2,9 @@
 TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
+v6.14.6 Mar 25 2015
+. (kfsone) Item names in .price files are now case insensitive (Ai Relics)
+
 v6.14.5 Mar 23 2015
 . (kfsone) Solved the missing 6.14.3 commits
 

cache.py

@@ -473,7 +473,7 @@ def getItemByNameIndex(cur):
     """
         Generate item name index.
     """
-    cur.execute("SELECT item_id, name FROM item")
+    cur.execute("SELECT item_id, UPPER(name) FROM item")
     return { name: itemID for (itemID, name) in cur }
 
 
@@ -650,29 +650,28 @@ def changeStation(matches):
         )
 
     addItem, addBuy, addSell = items.append, buys.append, sells.append
+    getItemID = itemByName.get
 
     def processItemLine(matches):
         itemName, modified = matches.group('item', 'time')
+        itemName = itemName.upper()
 
         # Look up the item ID.
-        try:
-            itemID = itemByName[itemName]
-        except KeyError:
-            itemID = -1
+        itemID = getItemID(itemName, -1)
         if itemID < 0:
             oldName = itemName
             itemName = corrections.correctItem(itemName)
             if itemName == DELETED:
                 DEBUG1("DELETED {}", oldName)
                 return
-            try:
-                itemID = itemByName[itemName]
-                DEBUG1("Renamed {} -> {}", oldName, itemName)
-            except KeyError:
+            itemName = itemName.upper()
+            itemID = getItemID(itemName, -1)
+            if itemID < 0:
                 ignoreOrWarn(
                     UnknownItemError(priceFile, lineNo, itemName)
                 )
                 return
+            DEBUG1("Renamed {} -> {}", oldName, itemName)
 
         # Check for duplicate items within the station.
         if itemID in processedItems:

misc/checkpricebounds.py

@@ -44,14 +44,14 @@ def remediation(item, compare, value):
         deletion = (
             "DELETE FROM {} "
             "WHERE item_id = {} "
-            "AND price {} {}".format(
+            "AND price > 0 AND price {} {}".format(
                 table, item.ID, compare, value
         ))
         deletions.append((deletion, "{}".format(item.dbname)))
         count = 0
         for (stnID,) in tdb.query("""
                     SELECT station_id FROM {}
-                     WHERE item_id = {} AND price {} {}
+                     WHERE item_id = {} AND price > 0 AND price {} {}
                 """.format(
                     table, item.ID, compare, value,
                 )):
@@ -71,6 +71,7 @@ def remediation(item, compare, value):
             SELECT price
               FROM {}
              WHERE item_id = ?
+               AND price > 0
         """.format(table), [item.ID])
         prices = [ row[0] for row in cur ]
         if not prices:
@@ -124,15 +125,15 @@ def remediation(item, compare, value):
             mask.format(
                 numPrices,
                 item.dbname,
-                prices[0] if prices[0] < lowCutoff else '-',
+                prices[0],
                 lowCutoff,
                 low, 
                 mid,
                 avg,
                 midavg,
                 high,
                 highCutoff,
-                prices[-1] if prices[-1] > highCutoff else '-',
+                prices[-1],
                 '{:<4s} {:>4n}'.format(error, count),
             ),
             colorama.Fore.RESET,