fixed conflicts

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index b59af1b..1505a67 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,6 +2,7 @@
 Meabook controller class
 """
 
+from meabook.constants import *
 import gettext
 
 _ = gettext.gettext
@@ -62,15 +63,21 @@ class MeabookController:
         """Gets all peoples."""
 
         # FIXME: read field names from Config
-        files_dict = self.model.get_files(['cn'], pattern=pattern)
-        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
-            internal_name in files_dict]
+        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):
+    def get_all_files_by_pattern(self, pattern, separated=False):
         """Gets all peoples matched pattern."""
 
-        return [(name, internal_name, 'f') for internal_name, name in \
-            self.model.get_files_by_pattern(pattern)]
+        if not separated:
+            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)
+            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]
 
     def get_fields(self):
         """Returns all exists fields from model."""
@@ -87,6 +94,11 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_search_dialog(self):
+        """Shows view Search Dialog."""
+
+        self.view.create_search_dialog(self)
+
     def show_import_dialog(self):
         """Shows view IMport Dialog."""