2008-01-04 Gary Burton <gary.burton@zen.co.uk>

* src/GrampsDbUtils/_ReadXML.py: removed code that is adding the gramps
	ID onto the end of pre-existing place descriptions. Bug #1502



svn: r9707
This commit is contained in:
Gary Burton 2008-01-04 21:41:49 +00:00
parent d24c1d818e
commit 8cf173b898
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2008-01-04 Gary Burton <gary.burton@zen.co.uk>
* src/GrampsDbUtils/_ReadXML.py: removed code that is adding the gramps
ID onto the end of pre-existing place descriptions. Bug #1502
2008-01-03 Benny Malengier <benny.malengier@gramps-project.org> 2008-01-03 Benny Malengier <benny.malengier@gramps-project.org>
* data/gramps.desktop.in: list more mime types, item 851 * data/gramps.desktop.in: list more mime types, item 851

View File

@ -757,6 +757,7 @@ class GrampsParser(UpdateCallback):
# GRAMPS LEGACY: title in the placeobj tag # GRAMPS LEGACY: title in the placeobj tag
self.placeobj.title = attrs.get('title', '') self.placeobj.title = attrs.get('title', '')
print attrs.get('ptitle')
self.locations = 0 self.locations = 0
self.update(self.p.CurrentLineNumber) self.update(self.p.CurrentLineNumber)
@ -1725,14 +1726,15 @@ class GrampsParser(UpdateCallback):
def stop_ptitle(self, tag): def stop_ptitle(self, tag):
self.placeobj.title = tag self.placeobj.title = tag
print tag
def stop_placeobj(self, *tag): def stop_placeobj(self, *tag):
if self.placeobj.title == "": if self.placeobj.title == "":
loc = self.placeobj.get_main_location() loc = self.placeobj.get_main_location()
self.placeobj.title = build_place_title(loc) self.placeobj.title = build_place_title(loc)
if self.placeobj.title in self.place_names: # if self.placeobj.title in self.place_names:
self.placeobj.title += " [%s]" % self.placeobj.gramps_id # self.placeobj.title += " [%s]" % self.placeobj.gramps_id
self.db.commit_place(self.placeobj, self.trans, self.change) self.db.commit_place(self.placeobj, self.trans, self.change)
self.placeobj = None self.placeobj = None