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

2770: Error on XML parser with data using '&'.

Browse Source 
2678: Error on import of gramps XML with xml codes in the ids


svn: r12390
This commit is contained in:
Benny Malengier 2009-03-28 13:18:17 +00:00
parent 3fa8f51025
commit eb29011083
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/export/ExportXml.py
View File

@ -423,7 +423,7 @@ class GrampsDbXmlWriter(UpdateCallback):
self.g.write(' ' * index + '<tag name="%s"' % name) self.g.write(' ' * index + '<tag name="%s"' % name)
if value: if value:
self.g.write(' value="%s"' % str(value)) self.g.write(' value="%s"' % escxml(str(value)))
self.g.write('>\n') self.g.write('>\n')
for (start, end) in tag.ranges: for (start, end) in tag.ranges:
@ -717,7 +717,7 @@ class GrampsDbXmlWriter(UpdateCallback):
marker_text = '' marker_text = ''
priv_text = conf_priv(obj) priv_text = conf_priv(obj)
change_text = ' change="%d"' % obj.get_change_time() change_text = ' change="%d"' % obj.get_change_time()
handle_id_text = ' id="%s" handle="_%s"' % (obj.gramps_id, obj.handle) handle_id_text = ' id="%s" handle="_%s"' % (escxml(obj.gramps_id), obj.handle)
obj_text = '%s<%s' % (sp,tagname) obj_text = '%s<%s' % (sp,tagname)
self.g.write(obj_text + handle_id_text + priv_text + marker_text + self.g.write(obj_text + handle_id_text + priv_text + marker_text +
@ -1064,7 +1064,6 @@ class GrampsDbXmlWriter(UpdateCallback):
title = self.fix(place.get_title()) title = self.fix(place.get_title())
longitude = self.fix(place.get_longitude()) longitude = self.fix(place.get_longitude())
lat = self.fix(place.get_latitude()) lat = self.fix(place.get_latitude())
handle = place.get_gramps_id()
main_loc = place.get_main_location() main_loc = place.get_main_location()
llen = len(place.get_alternate_locations()) \ llen = len(place.get_alternate_locations()) \
+ len(place.get_url_list()) + \ + len(place.get_url_list()) + \