* src/Utils.py: move event/attr constants to GedcomInfo.
* src/plugins/TestcaseGenerator.py: Use new methods. * src/DisplayTabs/_LdsModel.py: Use new methods. * src/Editors/_EditLdsOrd.py: Use new methods. * src/RelLib/_LdsOrd.py: Add new methods. * src/GrampsDb/_WriteGedcom.py: Do not import unused module. * src/GrampsDb/_ReadXML.py: Use methods from LdsOrd. * src/lds.py: Rename to LdsUtils.py * src/GrampsDb/_ReadGedcom.py: Use new module name. * src/Makefile.am (gdir_PYTHON): Ship new file. svn: r6770
This commit is contained in:
@@ -636,20 +636,12 @@ class GrampsParser(UpdateCallback):
|
||||
self.db.request_rebuild()
|
||||
|
||||
def start_lds_ord(self,attrs):
|
||||
atype = attrs['type']
|
||||
self.ord = RelLib.LdsOrd()
|
||||
self.ord.set_type_from_xml(attrs['type'])
|
||||
if self.person:
|
||||
if atype == "baptism":
|
||||
self.ord.set_type(RelLib.LdsOrd.BAPTISM)
|
||||
elif atype == "endowment":
|
||||
self.ord.set_type(RelLib.LdsOrd.ENDOWMENT)
|
||||
elif atype == "sealed_to_parents":
|
||||
self.ord.set_type(RelLib.LdsOrd.SEAL_TO_PARENTS)
|
||||
self.person.lds_ord_list.append(self.ord)
|
||||
elif self.family:
|
||||
if atype == "sealed_to_spouse":
|
||||
self.ord.set_type(RelLib.LdsOrd.SEAL_TO_SPOUSE)
|
||||
self.family.lds_ord_list.append(self.ord)
|
||||
self.family.lds_ord_list.append(self.ord)
|
||||
|
||||
def start_temple(self,attrs):
|
||||
self.ord.set_temple(attrs['val'])
|
||||
@@ -658,7 +650,12 @@ class GrampsParser(UpdateCallback):
|
||||
self.source.set_data_item(attrs['key'],attrs['value'])
|
||||
|
||||
def start_status(self,attrs):
|
||||
self.ord.set_status(int(attrs['val']))
|
||||
try:
|
||||
# old xml with integer statuses
|
||||
self.ord.set_status(int(attrs['val']))
|
||||
except ValueError:
|
||||
# string
|
||||
self.ord.set_status_from_xml(attrs['val'])
|
||||
|
||||
def start_sealed_to(self,attrs):
|
||||
try:
|
||||
|
Reference in New Issue
Block a user