Changes to: 1) bring trunk up to where gramps35 webapp was, 2) to bring old code up to python3 and pygobject use, and 3) use Django 1.4; (not all of webapp is back to working state yet)

svn: r20735

gramps/gen/db/dictionary.py

@@ -70,13 +70,13 @@ class Cursor(object):
     def __iter__(self):
         return self.__next__()
     def __next__(self):
-        for item in self.model.all():
-            yield (item.handle, self.func(item.handle))
+        for handle in self.model.keys():
+            yield (handle, self.func(handle))
     def __exit__(self, *args, **kwargs):
         pass
     def iter(self):
-        for item in self.model.all():
-            yield (item.handle, self.func(item.handle))
+        for handle in self.model.keys():
+            yield (handle, self.func(handle))
         yield None
 
 class Bookmarks:
@@ -673,9 +673,21 @@ class DictionaryDb(DbWriteBase, DbReadBase):
     def get_family_cursor(self):
         return Cursor(self.family_map, self.get_raw_family_data).iter()
 
-    def get_events_cursor(self):
+    def get_event_cursor(self):
         return Cursor(self.event_map, self.get_raw_event_data).iter()
 
+    def get_note_cursor(self):
+        return Cursor(self.note_map, self.get_raw_note_data).iter()
+
+    def get_tag_cursor(self):
+        return Cursor(self.tag_map, self.get_raw_tag_data).iter()
+
+    def get_repository_cursor(self):
+        return Cursor(self.repository_map, self.get_raw_repository_data).iter()
+
+    def get_media_cursor(self):
+        return Cursor(self.media_map, self.get_raw_object_data).iter()
+
     def get_citation_cursor(self):
         return Cursor(self.citation_map, self.get_raw_citation_data).iter()
 
@@ -784,6 +796,11 @@ class DictionaryDb(DbWriteBase, DbReadBase):
             return self.media_map[handle].serialize()
         return None
 
+    def get_raw_tag_data(self, handle):
+        if handle in self.tag_map:
+            return self.tag_map[handle].serialize()
+        return None
+
     def add_person(self, person, trans, set_gid=True):
         if not person.handle:
             person.handle = create_id()
@@ -925,3 +942,14 @@ class DictionaryDb(DbWriteBase, DbReadBase):
     def request_rebuild(self):
         pass
 
+    def copy_from_db(self, db):
+        """
+        A (possibily) implementation-specific method to get data from
+        db into this database.
+        """
+        for key in db._tables.keys():
+            cursor = db._tables[key]["cursor_func"]
+            class_ = db._tables[key]["class_func"]
+            for (handle, data) in cursor():
+                map = getattr(self, "%s_map" % key.lower())
+                map[handle] = class_.create(data)