Fix issue with old item in market service causing error due to being …

…non-existent.
pyfa-org · Dec 10, 2015 · 0dd9833 · 0dd9833
1 parent ae55a2c
commit 0dd9833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py
@@ -83,7 +83,8 @@ def getItem(lookfor, eager=None):
         else:
             # Item names are unique, so we can use first() instead of one()
             item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.name == lookfor).first()
-            itemNameMap[lookfor] = item.ID
+            if item:
+                itemNameMap[lookfor] = item.ID
     else:
         raise TypeError("Need integer or string as argument")
     return item

diff --git a/service/market.py b/service/market.py
@@ -504,8 +504,10 @@ def getVariationsByItems(self, items, alreadyparent=False):
             parents.add(parent)
             # Check for overrides and add them if any
             if parent.name in self.ITEMS_FORCEDMETAGROUP_R:
-                for itmn in self.ITEMS_FORCEDMETAGROUP_R[parent.name]:
-                    variations.add(self.getItem(itmn))
+                for item in self.ITEMS_FORCEDMETAGROUP_R[parent.name]:
+                    i = self.getItem(item)
+                    if i:
+                        variations.add(i)
         # Add all parents to variations set
         variations.update(parents)
         # Add all variations of parents to the set