From c8a5bf3ade5eb03eace1a946d7a3cc9645f00f41 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 18 Oct 2011 00:12:04 +0400
Subject: [PATCH] Make use of batch variation processing

---
 eos               |  2 +-
 service/market.py | 52 ++++++++++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/eos b/eos
index 86b257c6f..e86db41e4 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 86b257c6ff5553126eefcf25610a4f62f066e161
+Subproject commit e86db41e461700dba8e3634d7533793613305e2f
diff --git a/service/market.py b/service/market.py
index ae545c50b..4a541bef8 100644
--- a/service/market.py
+++ b/service/market.py
@@ -442,22 +442,30 @@ class Market():
             parent = None
         return parent
 
-    def getVariationsByItem(self, item, alreadyparent=False):
+    def getVariationsByItems(self, items, alreadyparent=False):
         """Get item variations by item, its ID or name"""
-        # Get parent item
-        if alreadyparent is False:
-            parent = self.getParentItemByItem(item)
-        else:
-            parent = item
-        # All its variations
-        vars = set(eos.db.getVariations(parent))
-        # Combine both in the same set
-        vars.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]:
-                vars.add(self.getItem(itmn))
-        return vars
+        # Set for IDs of parent items
+        parents = set()
+        # Set-container for variables
+        variations = set()
+        for item in items:
+            # Get parent item
+            if alreadyparent is False:
+                parent = self.getParentItemByItem(item)
+            else:
+                parent = item
+            # Combine both in the same set
+            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))
+        # Add all parents to variations set
+        variations.update(parents)
+        # Add all variations of parents to the set
+        parentids = tuple(item.ID for item in parents)
+        variations.update(eos.db.getVariations(parentids))
+        return variations
 
     def getGroupsByCategory(self, cat):
         """Get groups from given category"""
@@ -488,18 +496,20 @@ class Market():
             forceditms = set(self.getItem(itmn) for itmn in self.ITEMS_FORCEDMARKETGROUP_R[mg.ID])
             baseitms.update(forceditms)
         if vars:
+            parents = set()
             for item in baseitms:
                 # Add one of the base market group items to result
                 result.add(item)
                 parent = self.getParentItemByItem(item, selfparent=False)
                 # If item has no parent, it's base item (or at least should be)
                 if parent is None:
-                    # Fetch variations only for parent items
-                    variations = self.getVariationsByItem(item, alreadyparent=True)
-                    for variation in variations:
-                        # Exclude items with their own explicitly defined market groups
-                        if self.getMarketGroupByItem(variation, parentcheck=False) is None:
-                            result.add(variation)
+                    parents.add(item)
+            # Fetch variations only for parent items
+            variations = self.getVariationsByItems(parents, alreadyparent=True)
+            for variation in variations:
+                # Exclude items with their own explicitly defined market groups
+                if self.getMarketGroupByItem(variation, parentcheck=False) is None:
+                    result.add(variation)
         else:
             result = baseitms
         # Get rid of unpublished items