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

2007-02-26 Zsolt Foldvari <zfoldvar@users.sourceforge.net>

Browse Source 
* src/MarkupText.py: avoid creating empty elements in xml generator



svn: r8244
This commit is contained in:
Zsolt Foldvari 2007-02-26 14:23:59 +00:00
parent 5ae0ac4550
commit 551a36536e
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2007-02-26 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/MarkupText.py: avoid creating empty elements in xml generator
2007-02-25 Alex Roitman <shura@gramps-project.org> 2007-02-25 Alex Roitman <shura@gramps-project.org>
* src/DisplayTabs/_NoteTab.py: Import RelLib. * src/DisplayTabs/_NoteTab.py: Import RelLib.

35
src/MarkupText.py
View File

@ -66,9 +66,6 @@ class MarkupParser(ContentHandler):
@attr type: list[tuple((start, end), name, attrs),] @attr type: list[tuple((start, end), name, attrs),]
""" """
(EVENT_START,
EVENT_END) = range(2)
def startDocument(self): def startDocument(self):
self._open_document = False self._open_document = False
self._open_elements = [] self._open_elements = []
@ -114,6 +111,9 @@ class MarkupWriter:
It is assumed that 'start name' and 'end name' are equal (e.g. <b>, </b>). It is assumed that 'start name' and 'end name' are equal (e.g. <b>, </b>).
""" """
(EVENT_START,
EVENT_END) = range(2)
def __init__(self, encoding='utf-8'): def __init__(self, encoding='utf-8'):
self._output = StringIO() self._output = StringIO()
self._encoding = encoding self._encoding = encoding
@ -129,28 +129,28 @@ class MarkupWriter:
def _elements_to_events(self, elements): def _elements_to_events(self, elements):
"""Create an event list for XML writer. """Create an event list for XML writer.
@param tagdict: dictionary of tags with start and end indices @param elements: list of XML elements with start/end indices and attrs
@param type: {TextTag: [(start, end),]} @param type: [((start, end), xml_element_name, attrs),]
@return: eventdict @return: eventdict
@rtype: {index: [(TextTag, event_type, pair_index),]} @rtype: {index: [(xml_element_name, event_type, pair_index),]}
index: place of the event index: place of the event
TextTag: tag to apply xml_element_name: element to apply
event_type: START or END event event_type: START or END event
pair_index: index of the pair event, used for sorting pair_index: index of the pair event, used for sorting
""" """
eventdict = {} eventdict = {}
for (start, end), name, attrs in elements: for (start, end), name, attrs in elements:
# insert START events # append START events
if eventdict.has_key(start): if eventdict.has_key(start):
eventdict[start].append((name, MarkupParser.EVENT_START, end)) eventdict[start].append((name, MarkupWriter.EVENT_START, end))
else: else:
eventdict[start] = [(name, MarkupParser.EVENT_START, end)] eventdict[start] = [(name, MarkupWriter.EVENT_START, end)]
# insert END events # END events have to prepended to avoid creating empty elements
if eventdict.has_key(end): if eventdict.has_key(end):
eventdict[end].append((name, MarkupParser.EVENT_END, start)) eventdict[end].insert(0, (name, MarkupWriter.EVENT_END, start))
else: else:
eventdict[end] = [(name, MarkupParser.EVENT_END, start)] eventdict[end] = [(name, MarkupWriter.EVENT_END, start)]
# sort events at the same index # sort events at the same index
indices = eventdict.keys() indices = eventdict.keys()
@ -174,8 +174,8 @@ class MarkupWriter:
tag_a, type_a, pair_a = event_a tag_a, type_a, pair_a = event_a
tag_b, type_b, pair_b = event_b tag_b, type_b, pair_b = event_b
if (type_a + type_b) == (MarkupParser.EVENT_START + if (type_a + type_b) == (MarkupWriter.EVENT_START +
MarkupParser.EVENT_END): MarkupWriter.EVENT_END):
return type_b - type_a return type_b - type_a
else: else:
return pair_b - pair_a return pair_b - pair_a
@ -233,9 +233,9 @@ class MarkupWriter:
for index in indices: for index in indices:
self._writer.characters(text[last_pos:index]) self._writer.characters(text[last_pos:index])
for name, event_type, p in events[index]: for name, event_type, p in events[index]:
if event_type == MarkupParser.EVENT_START: if event_type == MarkupWriter.EVENT_START:
self._startElement(name) self._startElement(name)
elif event_type == MarkupParser.EVENT_END: elif event_type == MarkupWriter.EVENT_END:
self._endElement(name) self._endElement(name)
last_pos = index last_pos = index
self._writer.characters(text[last_pos:]) self._writer.characters(text[last_pos:])
@ -246,6 +246,7 @@ class MarkupWriter:
# copy result # copy result
self.content = self._output.getvalue() self.content = self._output.getvalue()
log.debug("Gramps XML: %s" % self.content)
class MarkupBuffer(gtk.TextBuffer): class MarkupBuffer(gtk.TextBuffer):
"""An extended TextBuffer with Gramps XML markup string interface. """An extended TextBuffer with Gramps XML markup string interface.