started remake search

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index 1505a67..efa8ecd 100644 (file)
--- 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]