From 2fe763e57092352e2d29fcb7de4f42d6332715d2 Mon Sep 17 00:00:00 2001 From: tanya Date: Tue, 22 Jun 2010 15:17:31 +0300 Subject: [PATCH] started remake search --- controller.py | 16 ++++++++-------- database/SQLite.py | 4 ++-- ui/hildon_ui.py | 1 + ui/hildon_ui.pyo | Bin 18832 -> 18877 bytes 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/controller.py b/controller.py index 1505a67..efa8ecd 100644 --- a/controller.py +++ b/controller.py @@ -26,7 +26,7 @@ class MeabookController: folders_list = list(self.get_all_folders(parent)) files_list = [(fields['cn'], internal_name, 'f') for internal_name, \ - fields in self.model.get_files(['cn'], parent).items()] + fields in self.model._get_files(['cn'], parent).items()] return folders_list + files_list def get_item(self, _id): @@ -59,13 +59,13 @@ class MeabookController: return [(name, internal_name, 'd') for name, internal_name in \ self.model.get_folders()] - def get_all_files(self): - """Gets all peoples.""" + #def get_all_files(self): + # """Gets all peoples.""" - # FIXME: read field names from Config - files_dict = self.model.get_files(['cn']) - return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \ - for internal_name in files_dict] + # # FIXME: read field names from Config + # files_dict = self.model.get_files(['cn']) + # return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \ + # for internal_name in files_dict] def get_all_files_by_pattern(self, pattern, separated=False): """Gets all peoples matched pattern.""" @@ -74,7 +74,7 @@ class MeabookController: return [(name, internal_name, TYPE_FILE) for internal_name, name \ in self.model.get_files_by_pattern(pattern)] else: - files_dict = self.model.get_files(['cn', 'o', 'ou'], pattern=pattern) + files_dict = self.model._get_files(['cn', 'o', 'ou'], 'cn', pattern, True) return [("%s" % files_dict[internal_name]['cn'], "%s / %s" % ( files_dict[internal_name]['o'], files_dict[internal_name]['ou']), \ internal_name, TYPE_FILE) for internal_name in files_dict] diff --git a/database/SQLite.py b/database/SQLite.py index 0b2447e..82558fd 100644 --- a/database/SQLite.py +++ b/database/SQLite.py @@ -237,7 +237,7 @@ class SQLite: 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): + def get_entry(self, _id): """Returns full entry by it id.""" execute = self.conn.execute @@ -251,7 +251,7 @@ class SQLite: entry_dict['image'] = sql_res[0] return entry_dict - def get_entry(self, _id): + def _get_entry(self, _id): """Returns full entry by it id.""" execute = self.conn.execute diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py index 43d9446..b2b35d1 100644 --- a/ui/hildon_ui.py +++ b/ui/hildon_ui.py @@ -6,6 +6,7 @@ import gtk import hildon import gobject from gettext import gettext as _ +from meabook.constants import * from meabook.ui.ui import MeabookUI diff --git a/ui/hildon_ui.pyo b/ui/hildon_ui.pyo index ca46d190944fe5af5c2cbd229bafd44517d2d358..333f8be821b725fda27fefa6fc2cd09c45dc6489 100644 GIT binary patch delta 3929 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 Pvpek8f={($+iLy~5{Bh) -- 1.7.9.5