gedcom import works on-line

svn: r19546

src/webapp/dbdjango.py

@@ -960,31 +960,40 @@ class DbDjango(DbWriteBase, DbReadBase):
         return obj.handle
 
     def commit_person(self, person, trans, change_time=None):
-        self.import_cache[person.handle] = person
+        if person.handle not in self.import_cache:
+            self.import_cache[person.handle] = person
 
     def commit_family(self, family, trans, change_time=None):
-        self.import_cache[family.handle] = family
+        if family.handle not in self.import_cache:
+            self.import_cache[family.handle] = family
 
     def commit_citation(self, citation, trans, change_time=None):
-        self.import_cache[citation.handle] = citation
+        if citation.handle not in self.import_cache:
+            self.import_cache[citation.handle] = citation
 
     def commit_source(self, source, trans, change_time=None):
-        self.import_cache[source.handle] = source
+        if source.handle not in self.import_cache:
+            self.import_cache[source.handle] = source
 
     def commit_repository(self, repository, trans, change_time=None):
-        self.import_cache[repository.handle] = repository
+        if repository.handle not in self.import_cache:
+            self.import_cache[repository.handle] = repository
 
     def commit_note(self, note, trans, change_time=None):
-        self.import_cache[note.handle] = note
+        if note.handle not in self.import_cache:
+            self.import_cache[note.handle] = note
 
     def commit_place(self, place, trans, change_time=None):
-        self.import_cache[place.handle] = place
+        if place.handle not in self.import_cache:
+            self.import_cache[place.handle] = place
 
     def commit_event(self, event, trans, change_time=None):
-        self.import_cache[event.handle] = event
+        if event.handle not in self.import_cache:
+            self.import_cache[event.handle] = event
 
     def commit_tag(self, tag, trans, change_time=None):
-        self.import_cache[tag.handle] = tag
+        if tag.handle not in self.import_cache:
+            self.import_cache[tag.handle] = tag
 
     def commit_media_object(self, obj, transaction, change_time=None):
         """

src/webapp/reports.py

@@ -65,7 +65,7 @@ def import_file(db, filename, callback):
                     etype, exception, traceback = error_tuple
                     print "ERROR:", name, exception
                 return False
-            import_function = getattr(mod, pdata.import_function)
+            retval = import_function = getattr(mod, pdata.import_function)
             db.prepare_import()
             import_function(db, filename, callback)
             db.commit_import()
@@ -73,7 +73,7 @@ def import_file(db, filename, callback):
             for person in Person.objects.all():
                 person.probably_alive = not bool(person.death)
                 person.save()
-            return True
+            return retval
     return False
 
 def download(url, filename=None):

src/webapp/shell.py

@@ -0,0 +1,18 @@
+from django.conf import settings
+import webapp.settings as default_settings
+try:
+    settings.configure(default_settings)
+except RuntimeError:
+    # already configured; ignore
+    pass
+
+from webapp.grampsdb.models import *
+from webapp.dbdjango import DbDjango
+from webapp.reports import import_file
+
+db = DbDjango()
+
+def Print(m):
+    print m
+
+import_file(db, "/tmp/dblank-im_ged.ged", Print)