GEDCOM import improvements

svn: r1061

src/Date.py

@@ -243,6 +243,10 @@ class Date:
                 self.range = -1
             self.text = text
 
+    def set_text(self,text):
+        self.range = -1
+        self.text = text
+
     def set_range(self,val):
         self.range = val
 

src/GedcomInfo.py

@@ -220,13 +220,3 @@ class GedInfoParser:
         elif tag == "residence":
             if u2l(attrs['val']) == 'place':
                 self.current.set_resi(RESIDENCE_PLAC)
-
-
-if __name__ == "__main__":
-
-    g = GedcomInfoDB()
-
-    print g.get_name_list()
-    o = g.get_description("Family Tree Maker")
-    for key in o.gramps2tag_map.keys():
-        print key,o.gramps2tag(key)

src/QuestionDialog.py

@@ -47,14 +47,3 @@ class QuestionDialog:
             self.task2()
         self.top.destroy()
         
-
-if __name__ == '__main__':
-    def task1(obj):
-        print obj,'1'
-
-    def task2(obj):
-        print obj,'2'
-        
-    QuestionDialog('mytitle','This is my message','Abc',task1,'Def',task2)
-
-    gtk.mainloop()

src/ReadXML.py

@@ -199,18 +199,3 @@ def loadRevision(database, file, filename, revision, callback=None):
 
     file.close()
     return 1
-
-
-if __name__ == "__main__":
-    import profile
-    import sys
-    import time
-    
-    database = GrampsDB()
-    t1 = time.time()
-    if len(sys.argv) > 2:
-        profile.run('loadData(database, sys.argv[1])')
-    else:
-        loadData(database,sys.argv[1])
-    t2 = time.time()
-    print t2-t1

src/latin_utf8.py

@@ -36,7 +36,10 @@ else:
 
         def utf8_to_latin(s):
             y = UTF8String(s)
+            try:
                 return y.encode("iso-8859-1")
+            except:
+                return y.encode("<Invalid UNICODE>")
 
         def latin_to_utf8(s):
             buff = cStringIO.StringIO()

src/plugins/ChangeTypes.py

@@ -66,11 +66,8 @@ class ChangeTypes:
         original = self.glade.get_widget("original_text").get_text()
         new = self.glade.get_widget("new_text").get_text()
 
-        print original
-        print new
         for person in self.db.getPersonMap().values():
             for event in person.getEventList():
-                print event.getName()
                 if event.getName() == original:
                     event.setName(new)
                     modified = modified + 1

src/plugins/ReadGedcom.py

@@ -917,6 +917,7 @@ class GedcomParser:
                 self.family.addPhoto(photo)
 
     def parse_residence(self,address,level):
+        note = ""
         while 1:
             matches = self.get_next()
 
@@ -1293,6 +1294,7 @@ class GedcomParser:
         
     def parse_name(self,name,level):
         """Parses the person's name information"""
+        note = ""
         while 1:
 	    matches = self.get_next()
 	    if int(matches[0]) < level:
@@ -1538,6 +1540,7 @@ class GedcomParser:
 
     def extract_date(self,text):
         dateobj = Date.Date()
+        try:
             match = fromtoRegexp.match(text)
             if match:
                 (cal1,data1,cal2,data2) = match.groups()
@@ -1569,7 +1572,8 @@ class GedcomParser:
                     dateobj.get_start_date().setMode(abt)
             else:
                 dateobj.set(text)
-
+        except:
+            dateobj.set_text(text)
         return dateobj
 
     def handle_source(self,matches,level):