fixed initial search and added nicknames

1 files changed, 40 insertions, 16 deletions

diff --git a/lib/d2/app/adapters/search.py b/lib/d2/app/adapters/search.py
index 034e2c9..0e1c38f 100644
--- a/lib/d2/app/adapters/search.py
+++ b/lib/d2/app/adapters/search.py
@@ -24,6 +24,16 @@ class SearchAdapter(BaseAdapter):
 
     PERM_DIR = stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR
     SEARCH_ARGS = ['label', 'description', 'plot_id', 'occupant_id']
+    NICKNAMES = {
+        u'Michael': [u'Mike'],
+        u'Mike': [u'Michael'],
+        u'James': [u'Jim', u'Jimmy'],
+        u'Jim': [u'James', u'Jimmy'],
+        u'Jimmy': [u'James', u'Jim'],
+        u'Leonard': [u'Len', u'Lenny'],
+        u'Matt Gibberman': [u'Snow Dog']
+    }
+
 
     def __init__(self, db, log, index_directory, static, detail, detail_type,
                  detail_adapter, forge_adapter):
@@ -204,13 +214,21 @@ class SearchAdapter(BaseAdapter):
         out = []
         data = data.split(u' ')
         for word in data:
-            out.append(word[0])
+            word = word.strip().upper()
+            if word:
+                out.append(word[0])
+
             if len(out) >= 2:
                 break
         if len(out) == 2:
             out = u''.join(out)
-            return out.upper()
+            return out
 
+    def _label_to_nicknames(self, label):
+        for name, nicknames in self.NICKNAMES.items():
+            if label.lower().startswith(name.lower()):
+                return nicknames
+        return []
 
     def _build_search_dictionaries(self, results):
         out = []
@@ -229,13 +247,18 @@ class SearchAdapter(BaseAdapter):
             if details[u'plot_id']:
                 if u'empty' in out['description'].lower():
                     context.append(u'Empty')
-            else:
+            if details[u'occupant_id']:
                 alt_label = self._split_label(out[u'label'])
                 if alt_label != out[u'label']:
                     context.append(alt_label)
-                initials = self._label_to_initials(out[u'label'])
+                initials = self._label_to_initials(details[u'label'])
                 if initials:
                     context.append(initials)
+                nicknames = self._label_to_nicknames(details[u'label'])
+                if nicknames:
+                    for nickname in nicknames:
+                        print nickname
+                        context.append(nickname)
 
             for key, detail in details.items():
                 if isinstance(detail, dict):
@@ -288,16 +311,17 @@ class SearchAdapter(BaseAdapter):
 
     def search(self, user_query_string):
         out = []
-        user_query_string = self._build_query(user_query_string)
-        with self.ix.searcher() as searcher:
-            query = QueryParser("context", self.ix.schema)
-            myquery = query.parse(user_query_string)
-            results = searcher.search(myquery)
-            for row in results[0:len(results)]:
-                out.append(self._make_search_result(
-                        row[u'label'],
-                        row[u'description'],
-                        row.get(u'plot_id') or None,
-                        row.get(u'occupant_id') or None
-                    ))
+        if len(user_query_string.strip()) > 1:
+            user_query_string = self._build_query(user_query_string)
+            with self.ix.searcher() as searcher:
+                query = QueryParser("context", self.ix.schema)
+                myquery = query.parse(user_query_string)
+                results = searcher.search(myquery)
+                for row in results[0:len(results)]:
+                    out.append(self._make_search_result(
+                            row[u'label'],
+                            row[u'description'],
+                            row.get(u'plot_id') or None,
+                            row.get(u'occupant_id') or None
+                        ))
         return out