فهرست منبع

restore usability of filtering tags

this was practically broken since the introduction
of new tag class
oz123 13 سال پیش
والد
کامیت
2edfd987b1
1فایلهای تغییر یافته به همراه6 افزوده شده و 5 حذف شده
  1. 6 5
      pwman/data/drivers/sqlite.py

+ 6 - 5
pwman/data/drivers/sqlite.py

@@ -107,7 +107,7 @@ class SQLiteDatabaseNewForm(Database):
 
 
                 sql += ("SELECT NODE FROM LOOKUP LEFT JOIN TAGS ON TAG = "
                 sql += ("SELECT NODE FROM LOOKUP LEFT JOIN TAGS ON TAG = "
                         + " TAGS.ID WHERE TAGS.DATA = ?")
                         + " TAGS.ID WHERE TAGS.DATA = ?")
-                params.append(t.get_name())
+                params.append(t._name)
             sql += ") EXCEPT SELECT DATA FROM TAGS WHERE "
             sql += ") EXCEPT SELECT DATA FROM TAGS WHERE "
             first = True
             first = True
             for t in self._filtertags:
             for t in self._filtertags:
@@ -116,7 +116,7 @@ class SQLiteDatabaseNewForm(Database):
                 else:
                 else:
                     first = False
                     first = False
                 sql += "TAGS.DATA = ?"
                 sql += "TAGS.DATA = ?"
-                params.append(t)
+                params.append(t._name)
         try:
         try:
             self._cur.execute(sql, params)
             self._cur.execute(sql, params)
             tags = []
             tags = []
@@ -128,8 +128,9 @@ class SQLiteDatabaseNewForm(Database):
             return tags
             return tags
         except sqlite.DatabaseError, e:
         except sqlite.DatabaseError, e:
             raise DatabaseException("SQLite: %s" % (e))
             raise DatabaseException("SQLite: %s" % (e))
-        except sqlite.InterfaceError:
-            import ipdb; ipdb.set_trace()  # XXX BREAKPOINT
+        except sqlite.InterfaceError, e:
+            import ipdb
+            ipdb.set_trace()  # XXX BREAKPOINT
 
 
     def parse_node_string(self, string):
     def parse_node_string(self, string):
         nodestring = string.split("##")
         nodestring = string.split("##")
@@ -223,7 +224,7 @@ class SQLiteDatabaseNewForm(Database):
                     first = False
                     first = False
                 sql += ("SELECT NODE FROM LOOKUP LEFT JOIN TAGS ON TAG = "
                 sql += ("SELECT NODE FROM LOOKUP LEFT JOIN TAGS ON TAG = "
                         " TAGS.ID WHERE TAGS.DATA = ? ")
                         " TAGS.ID WHERE TAGS.DATA = ? ")
-                params.append(t.get_name())
+                params.append(t._name)
         try:
         try:
             self._cur.execute(sql, params)
             self._cur.execute(sql, params)
             ids = []
             ids = []