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

Fixed unicode handling of place objects

Browse Source 
svn: r343
This commit is contained in:
Don Allingham 2001-08-18 19:33:46 +00:00
parent f320e5fea4
commit 5f4b7077f0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gramps/src/GrampsParser.py
View File

@ -172,13 +172,13 @@ class GrampsParser(handler.ContentHandler):
def start_location(self,attrs): def start_location(self,attrs):
loc = Location() loc = Location()
if attrs.has_key('city'): if attrs.has_key('city'):
loc.set_city(attrs['city']) loc.set_city(ul2(attrs['city']))
if attrs.has_key('state'): if attrs.has_key('state'):
loc.set_state(attrs['state']) loc.set_state(u2l(attrs['state']))
if attrs.has_key('county'): if attrs.has_key('county'):
loc.set_state(attrs['county']) loc.set_state(u2l(attrs['county']))
if attrs.has_key('country'): if attrs.has_key('country'):
loc.set_state(attrs['country']) loc.set_state(u2l(attrs['country']))
if attrs.has_key('type'): if attrs.has_key('type'):
self.placeobj.add_alternate_locations(loc) self.placeobj.add_alternate_locations(loc)
else: else:
@ -191,9 +191,9 @@ class GrampsParser(handler.ContentHandler):
#--------------------------------------------------------------------- #---------------------------------------------------------------------
def start_coord(tag,attrs): def start_coord(tag,attrs):
if attrs.has_key('lat'): if attrs.has_key('lat'):
self.placeobj.set_latitude(attrs['lat']) self.placeobj.set_latitude(u2l(attrs['lat']))
if attrs.has_key('long'): if attrs.has_key('long'):
self.placeobj.set_longitude(attrs['long']) self.placeobj.set_longitude(u2l(attrs['long']))
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
@ -543,13 +543,13 @@ class GrampsParser(handler.ContentHandler):
#--------------------------------------------------------------------- #---------------------------------------------------------------------
def stop_place(self,tag): def stop_place(self,tag):
if self.placeobj == None: if self.placeobj == None:
if self.place_map.has_key(tag): if self.place_map.has_key(u2l(tag)):
self.placeobj = self.place_map[tag] self.placeobj = self.place_map[u2l(tag)]
else: else:
self.placeobj = Place() self.placeobj = Place()
self.placeobj.set_title(tag) self.placeobj.set_title(u2l(tag))
self.db.addPlace(self.placeobj) self.db.addPlace(self.placeobj)
self.place_map[tag] = self.placeobj self.place_map[u2l(tag)] = self.placeobj
self.event.place = self.placeobj self.event.place = self.placeobj
#--------------------------------------------------------------------- #---------------------------------------------------------------------