4209: XML DTD rewrite, cleanup

svn: r17648

src/Merge/test/merge_ref_test.py

@@ -121,7 +121,7 @@ class BaseMergeCheck(unittest.TestCase):
     def do_test(self, phoenix_id, titanic_id, input_doc, expect_doc,
                 test_error_str='', debug=False):
         """Do the merge and "assert" the result."""
-        process = subprocess.Popen('python gramps.py '
+        process = subprocess.Popen('python gramps.py -d .ImportXML '
                                    '--config=preferences.eprefix:DEFAULT '
                                    '-i - -f gramps -a tool '
                                    '-p "name=climerge,primary=%s,secondary=%s" '
@@ -143,7 +143,7 @@ class BaseMergeCheck(unittest.TestCase):
 
     def do_family_test(self, phoenix_id, titanic_id, father_h, mother_h,
                        input_doc, expect_doc, test_error_str='', debug=False):
-        process = subprocess.Popen('python gramps.py '
+        process = subprocess.Popen('python gramps.py -d .ImportXML '
                                    '--config=preferences.eprefix:DEFAULT '
                                    '-i - -f gramps -a tool '
                                    '-p "name=climerge,primary=%s,secondary=%s,father_h=%s,mother_h=%s" '
@@ -165,7 +165,7 @@ class BaseMergeCheck(unittest.TestCase):
 
     def raw_contains(self, phoenix_id, titanic_id, input_doc, expect_str,
                 test_error_str='', debug=False):
-        process = subprocess.Popen('python gramps.py '
+        process = subprocess.Popen('python gramps.py -d .ImportXML '
                                    '--config=preferences.eprefix:DEFAULT '
                                    '-i - -f gramps -a tool '
                                    '-p "name=climerge,primary=%s,secondary=%s" '

src/gen/db/read.py

@@ -1076,7 +1076,7 @@ class DbBsddbRead(DbReadBase, Callback):
             str_prefix = pattern_match.group(1)
             nr_width = pattern_match.group(2)
             def closure_func(gramps_id):
-                if gramps_id.startswith(str_prefix):
+                if gramps_id and gramps_id.startswith(str_prefix):
                     id_number = gramps_id[len(str_prefix):]
                     if id_number.isdigit():
                         id_value = int(id_number, 10)