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

Better handling of characters in XML parsing

Browse Source 
svn: r435
This commit is contained in:
Don Allingham
2001-09-28 02:34:58 +00:00
parent c319d27a2d
commit d5bba7b585
2 changed files with 33 additions and 3675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gramps/src/GrampsParser.py
View File

@@ -76,6 +76,7 @@ class GrampsParser(handler.ContentHandler):
self.stext_list = [] self.stext_list = []
self.scomments_list = [] self.scomments_list = []
self.note_list = [] self.note_list = []
self.tlist = []
self.use_p = 0 self.use_p = 0
self.in_note = 0 self.in_note = 0
@@ -115,7 +116,6 @@ class GrampsParser(handler.ContentHandler):
self.name = None self.name = None
self.tempDefault = None self.tempDefault = None
self.owner = Researcher() self.owner = Researcher()
self.data = ""
self.func_list = [None]*50 self.func_list = [None]*50
self.func_index = 0 self.func_index = 0
self.func = None self.func = None
@@ -401,12 +401,12 @@ class GrampsParser(handler.ContentHandler):
self.source_ref = SourceRef() self.source_ref = SourceRef()
source = self.db.findSourceNoMap(u2l(attrs["ref"])) source = self.db.findSourceNoMap(u2l(attrs["ref"]))
self.source_ref.setBase(source) self.source_ref.setBase(source)
if self.address: if self.event:
self.event.setSourceRef(self.source_ref)
elif self.address:
self.address.setSourceRef(self.source_ref) self.address.setSourceRef(self.source_ref)
elif self.name: elif self.name:
self.name.setSourceRef(self.source_ref) self.name.setSourceRef(self.source_ref)
elif self.event:
self.event.setSourceRef(self.source_ref)
elif self.attribute: elif self.attribute:
self.attribute.setSourceRef(self.source_ref) self.attribute.setSourceRef(self.source_ref)
elif self.placeobj: elif self.placeobj:
@@ -967,9 +967,9 @@ class GrampsParser(handler.ContentHandler):
#--------------------------------------------------------------------- #---------------------------------------------------------------------
def startElement(self,tag,attrs): def startElement(self,tag,attrs):
self.func_list[self.func_index] = (self.func,self.data) self.func_list[self.func_index] = (self.func,self.tlist)
self.func_index = self.func_index + 1 self.func_index = self.func_index + 1
self.data = "" self.tlist = []
try: try:
f,self.func = GrampsParser.func_map[tag] f,self.func = GrampsParser.func_map[tag]
@@ -988,13 +988,13 @@ class GrampsParser(handler.ContentHandler):
def endElement(self,tag): def endElement(self,tag):
if self.func: if self.func:
self.func(self,self.data) self.func(self,string.join(self.tlist))
self.func_index = self.func_index - 1 self.func_index = self.func_index - 1
self.func,self.data = self.func_list[self.func_index] self.func,self.tlist = self.func_list[self.func_index]
def characters(self, data): def characters(self, data):
if self.func: if self.func:
self.data = self.data + data self.tlist.append(data)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

3688
gramps/src/po/de.po
View File

File diff suppressed because it is too large Load Diff