start refactoring

[meabook] / database / SQLite.py

diff --git a/database/SQLite.py b/database/SQLite.py
index a51f505..15cb852 100644 (file)
--- a/database/SQLite.py
+++ b/database/SQLite.py
@@ -157,10 +157,12 @@ class SQLite:
         fields = execute("SELECT id, name FROM fields WHERE name IN (%s)" \
             % ','.join('%r' % (field,) for field in fields)).fetchall()
         if parent == 0: # get all files
+            field_id = execute("SELECT id FROM fields WHERE name=?", \
+                ('cn',)).fetchone()[0]
             #data_ids = [_id[0] for _id in execute("SELECT DISTINCT id FROM \
             #    data").fetchall()]
             data_ids = [_id[0] for _id in execute("SELECT DISTINCT id FROM \
-                data WHERE value LIKE '%s%%' LIMIT 50" % pattern.capitalize()).fetchall()]
+                data WHERE value LIKE '%s%%' AND field_id=? LIMIT 50" % pattern.capitalize(), (field_id,)).fetchall()]
         else: # get files for selected parent
             data_ids = [_id[0] for _id in execute("SELECT data_id FROM \
                 relation WHERE struct_id=?", (parent,)).fetchall()]