revise amulet search to consider of seed1 value,

[amulettoolsmh4/main.git] / model / amuletskillsholder.py

diff --git a/model/amuletskillsholder.py b/model/amuletskillsholder.py
index 355f5dc..a7effe8 100644 (file)
--- a/model/amuletskillsholder.py
+++ b/model/amuletskillsholder.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # お守りのスキル保持用クラス
-# 2013/12/04 written by kei9 
+# 2013/12/09 written by kei9 
 
 import db_supports
 
@@ -20,11 +20,11 @@ class AmuletSkillsHolder(object):
         else:
             return False
 
-    def get_where_sql(self, remove_where=False):
+    def get_where_and_sql(self, remove_where=False):
         u""" SQLのWhere文に変換する(AND結合) """
         if any([x is not None for x in self.skill_id_list]):
             valid_eqls = []
-            for col, skill_id in zip(db_supports.SECOND_COL_SKILL_LIST, self.skill_id_list):
+            for col, skill_id in zip(db_supports.SEED2_SKILL2_COL_SKILL2_LIST, self.skill_id_list):
                 if skill_id is not None:
                     valid_eqls.append(u"{col}={skill_id}".format(col=col,skill_id=skill_id)) 
             if remove_where: