From 28df0746c7bb432f217ab1715350f392ffec6878 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sat, 18 May 2002 17:16:29 +0000
Subject: [PATCH] Fixes for ZODB mode

svn: r997
---
 gramps/src/GrampsXML.py          |  2 +-
 gramps/src/RelLib.py             |  3 ---
 gramps/src/gramps_main.py        | 12 +++---------
 gramps/src/plugins/ReadNative.py |  2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/gramps/src/GrampsXML.py b/gramps/src/GrampsXML.py
index 361e2111b..e5a662a8f 100644
--- a/gramps/src/GrampsXML.py
+++ b/gramps/src/GrampsXML.py
@@ -47,6 +47,6 @@ class GrampsXML(GrampsDB):
         self.sourceTable = {}
         for key in self.sourceMap.keys():
             src = self.sourceMap[key]
-            self.sourceTable[key] = source.getDisplayInfo()
+            self.sourceTable[key] = src.getDisplayInfo()
 
         return 1
diff --git a/gramps/src/RelLib.py b/gramps/src/RelLib.py
index c929c0496..3edee5bdd 100644
--- a/gramps/src/RelLib.py
+++ b/gramps/src/RelLib.py
@@ -1620,9 +1620,6 @@ class Family(Persistent):
         """Sets the list of Photo objects"""
         self.photoList = list
 
-    def unique_note(self):
-        self.note = Note(self.note.get())
-
     def someChildIsAncestor(self):
         for child in self.Children:
             if (child.getAncestor()):
diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py
index b923fba44..53b33bf72 100755
--- a/gramps/src/gramps_main.py
+++ b/gramps/src/gramps_main.py
@@ -72,6 +72,7 @@ import EditPerson
 import Marriage
 import Find
 import VersionControl
+import ReadXML
 
 from GrampsXML import GrampsXML
 try:
@@ -896,22 +897,19 @@ class Gramps:
             gnome.ui.GnomeErrorDialog(msg)
 
     def delete_person_response(self):
-        personmap = self.db.getPersonMap()
-        familymap = self.db.getPersonMap()
-
         for family in self.active_person.getFamilyList():
             if self.active_person.getGender == Person.male:
                 if family.getMother() == None:
                     for child in family.getChildList():
                         child.removeAltFamily(family)
-                    del familymap[family]
+                    self.db.removeFamily(family)
                 else:
                     family.setFather(None)
             else:
                 if family.getFather() == None:
                     for child in family.getChildList():
                         child.removeAltFamily(family)
-                    del familymap[family]
+                    self.db.removeFamily(family)
                 else:
                     family.setMother(None)
 
@@ -1428,9 +1426,6 @@ class Gramps:
     def redisplay_person_list(self,person):
         pos = (person,0)
         self.id2col[person.getId()] = pos
-        gname = Utils.phonebook_from_name
-        bsn = sort.build_sort_name
-        bsd = sort.build_sort_date
         
         if self.DataFilter.compare(person):
             self.person_list.insert(0,person.getDisplayInfo())
@@ -1824,7 +1819,6 @@ class Gramps:
     def apply_filter(self):
         self.person_list.freeze()
         datacomp = self.DataFilter.compare
-        gname = Utils.phonebook_from_name
         
         self.person_list.set_column_visibility(1,GrampsCfg.id_visible)
     
diff --git a/gramps/src/plugins/ReadNative.py b/gramps/src/plugins/ReadNative.py
index 00a3f39aa..0179619c5 100644
--- a/gramps/src/plugins/ReadNative.py
+++ b/gramps/src/plugins/ReadNative.py
@@ -67,7 +67,7 @@ class ReadNative:
         if name == "":
             return
 
-        name = "%s/%s" % (name,const.indexFile)
+        name = "%s/%s" % (name,const.xmlFile)
         Utils.destroy_passed_object(self.top)
         importData(self.db,name,progress)
         self.callback(1)