Move LookupStoreHacker to database

2 files changed, 17 insertions, 12 deletions

diff --git a/database.py b/database.py
index 321c5bf..fcf07af 100644
--- a/database.py
+++ b/database.py
@@ -103,6 +103,19 @@ def LookupID (id):
     except KeyError:
         return None
 
+def LookupStoreHacker(name, email, mapunknown = False):
+    email = RemapEmail(email)
+    h = LookupEmail(email)
+    if h: # already there
+        return h
+    elist = LookupEmployer(email, mapunknown)
+    h = LookupName(name)
+    if h: # new email
+        h.addemail(email, elist)
+        return h
+    return StoreHacker(name, elist, email)
+
+
 def AllHackers ():
     return HackersByID.values ()
 #    return [h for h in HackersByID.values ()] #  if (h.added + h.removed) > 0]
diff --git a/gitdm b/gitdm
index 14dc88e..c2b20cd 100755
--- a/gitdm
+++ b/gitdm
@@ -153,19 +153,11 @@ def NoteFileAccess(paths):
             AddAccess(path)
             path, last = os.path.split(path)
 
-
-
+#
+# Local version still, for now
+#
 def LookupStoreHacker(name, email):
-    email = database.RemapEmail(email)
-    h = database.LookupEmail(email)
-    if h: # already there
-        return h
-    elist = database.LookupEmployer(email, MapUnknown)
-    h = database.LookupName(name)
-    if h: # new email
-        h.addemail(email, elist)
-        return h
-    return database.StoreHacker(name, elist, email)
+    return database.LookupStoreHacker(name, email, MapUnknown)
 
 #
 # Date tracking.