Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Gramps XML schemas

Browse Source 
Also made a slight change to the XML format for places.
This commit is contained in:
Nick Hall
2014-05-14 22:10:38 +01:00
parent 5f7f7104ac
commit 27dab7c811
4 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gramps/plugins/export/exportxml.py
View File

@@ -1190,15 +1190,16 @@ class GrampsXmlWriter(UpdateCallback):
)
def write_place_obj(self, place, index=1):
self.write_primary_tag("placeobj", place, index)
self.write_primary_tag("placeobj", place, index, close=False)
pname = self.fix(place.get_name())
ptype = self.fix(place.get_type().xml_str())
self.g.write(' name="%s"' % pname)
self.g.write(' type="%s"' % ptype)
self.g.write('>\n')
title = self.fix(place.get_title())
name = self.fix(place.get_name())
ptype = self.fix(place.get_type().xml_str())
code = self.fix(place.get_code())
self.write_line_nofix("ptitle", title, index+1)
self.write_line_nofix("pname", name, index+1)
self.write_line_nofix("type", ptype, index+1)
self.write_line_nofix("code", code, index+1)
for name in place.get_alternative_names():
self.write_line("alt_name", name, index+1)

9
gramps/plugins/importer/importxml.py
View File

@@ -689,7 +689,6 @@ class GrampsParser(UpdateCallback):
"places": (None, self.stop_places),
"placeobj": (self.start_placeobj, self.stop_placeobj),
"placeref": (self.start_placeref, self.stop_placeref),
"pname": (None, self.stop_pname),
"ptitle": (None, self.stop_ptitle),
"location": (self.start_location, None),
"lds_ord": (self.start_lds_ord, self.stop_lds_ord),
@@ -1150,6 +1149,8 @@ class GrampsParser(UpdateCallback):
self.inaugurate_id(attrs.get('id'), PLACE_KEY, self.placeobj)
self.placeobj.private = bool(attrs.get("priv"))
self.placeobj.change = int(attrs.get('change', self.change))
self.placeobj.name = attrs.get("name")
self.placeobj.place_type.set_from_xml_str(attrs.get("type"))
self.info.add('new-object', PLACE_KEY, self.placeobj)
# GRAMPS LEGACY: title in the placeobj tag
@@ -2578,9 +2579,6 @@ class GrampsParser(UpdateCallback):
def stop_ptitle(self, tag):
self.placeobj.title = tag
def stop_pname(self, tag):
self.placeobj.name = tag
def stop_code(self, tag):
self.placeobj.code = tag
@@ -2604,9 +2602,6 @@ class GrampsParser(UpdateCallback):
elif self.repo:
# Repository type
self.repo.type.set_from_xml_str(tag)
elif self.placeobj:
# Place type
self.placeobj.place_type.set_from_xml_str(tag)
def stop_childref(self, tag):
self.childref = None