|
@@ -90,15 +90,13 @@ class SQLiteDatabaseNewForm(Database):
|
|
def listtags(self, alltags=False):
|
|
def listtags(self, alltags=False):
|
|
sql = ''
|
|
sql = ''
|
|
params = []
|
|
params = []
|
|
- if len(self._filtertags) == 0 or alltags:
|
|
|
|
|
|
+ if not self._filtertags or alltags:
|
|
sql = "SELECT DATA FROM TAGS ORDER BY DATA ASC"
|
|
sql = "SELECT DATA FROM TAGS ORDER BY DATA ASC"
|
|
else:
|
|
else:
|
|
sql = ("SELECT TAGS.DATA FROM LOOKUP"
|
|
sql = ("SELECT TAGS.DATA FROM LOOKUP"
|
|
+ " INNER JOIN TAGS ON LOOKUP.TAG = TAGS.ID"
|
|
+ " INNER JOIN TAGS ON LOOKUP.TAG = TAGS.ID"
|
|
+ " WHERE NODE IN (")
|
|
+ " WHERE NODE IN (")
|
|
first = True
|
|
first = True
|
|
- # if using the command filter, the code crashes ...
|
|
|
|
- #
|
|
|
|
for t in self._filtertags:
|
|
for t in self._filtertags:
|
|
if not first:
|
|
if not first:
|
|
sql += " INTERSECT "
|
|
sql += " INTERSECT "
|