implemented search by second name

[meabook] / database / SQLite.py

diff --git a/database/SQLite.py b/database/SQLite.py
index 28229cb..2b6d3ab 100644 (file)
--- a/database/SQLite.py
+++ b/database/SQLite.py
@@ -1,12 +1,13 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+
 import os
 import sqlite3
+from meabook.constants import *
 
 DATABASE_NAME = 'contacts.db'
 
-TOPLEVEL_FIELD = 'o'
-MIDDLELEVEL_FIELD = 'ou'
-LOWLEVEL_FIELD = 'cn'
-
 SCHEMA = """
     begin;
 
@@ -83,8 +84,8 @@ class SQLite:
     def get_fields(self):
         """Returns all fields from FIELDS table."""
 
-        return [item[0] for item in self.conn.execute( \
-            "SELECT name FROM fields").fetchall()]
+        return [item[0] for item in self.conn.execute("SELECT name FROM \
+            fields").fetchall() if item[0]!='image']
 
     # operations with DATA table
     def add_entry(self, entry):
@@ -114,19 +115,19 @@ class SQLite:
                     (_id, field_id, value))
 
         # update STRUCT table
-        name = entry[TOPLEVEL_FIELD][0]
+        name = entry[FIELD_TOPLEVEL][0]
         parent_id = execute("SELECT id FROM struct WHERE name=? ", \
             (name,)).fetchone()
-        if parent_id is None: # update STRUCT table (TOPLEVEL_FIELD)
+        if parent_id is None: # update STRUCT table (FIELD_TOPLEVEL)
             execute("INSERT INTO struct values(NULL,?,0)", (name,))
             parent_id = execute("SELECT last_insert_rowid()").fetchone()[0]
         else:
             parent_id = parent_id[0]
 
-        name = entry[MIDDLELEVEL_FIELD][0]
+        name = entry[FIELD_MIDDLELEVEL][0]
         child_id = execute("SELECT id FROM struct WHERE name=? AND parent=?", \
             (name, parent_id)).fetchone()
-        if child_id is None: # update STRUCT table (MIDDLELEVEL_FIELD)
+        if child_id is None: # update STRUCT table (FIELD_MIDDLELEVEL)
             execute("INSERT INTO struct values(NULL,?,?)", (name, parent_id))
             child_id = execute("SELECT last_insert_rowid()").fetchone()[0]
         else:
@@ -169,6 +170,17 @@ class SQLite:
                 items_dict[data_id][field_name] = field_value
         return items_dict
 
+    def get_files_by_pattern(self, pattern):
+        """Returns list of all files, matched pattern string."""
+
+        if not pattern:
+            return []
+        execute = self.conn.execute
+        field_id = execute("SELECT id FROM fields WHERE name=?", \
+            ('cn',)).fetchone()[0]
+        return execute("SELECT id, value FROM data WHERE value LIKE '%s%%' \
+            AND field_id=? LIMIT 50" % pattern.capitalize(), (field_id,)).fetchall()
+
     def get_entry(self, _id):
         """Returns full entry by it id."""
 
@@ -179,4 +191,8 @@ class SQLite:
             field_name = execute("SELECT name FROM fields WHERE id=?", \
                 (field_id,)).fetchone()[0]
             entry_dict[field_name] = value
+        sql_res = execute('select photo from photo where data_id=?', \
+            (_id,)).fetchone()
+        if sql_res is not None:
+            entry_dict['image'] = sql_res[0]
         return entry_dict