raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

more clean ups

Browse Source
This commit is contained in:
Andreas Preikschat 2011-03-15 19:38:56 +01:00
parent bf4ecad9d1
commit 8b49c39fa5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/forms/editsongform.py
View File

@ -728,8 +728,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.song.title = unicode(self.titleEdit.text()) self.song.title = unicode(self.titleEdit.text())
self.song.alternate_title = unicode(self.alternativeEdit.text()) self.song.alternate_title = unicode(self.alternativeEdit.text())
self.song.copyright = unicode(self.copyrightEdit.text()) self.song.copyright = unicode(self.copyrightEdit.text())
# Values will be set when cleaning the song.
self.song.search_title = u'' self.song.search_title = u''
self.song.search_lyrics = u'' self.song.search_lyrics = u''
song.verse_order = u''
self.song.comments = unicode(self.commentsEdit.toPlainText()) self.song.comments = unicode(self.commentsEdit.toPlainText())
ordertext = unicode(self.verseOrderEdit.text()) ordertext = unicode(self.verseOrderEdit.text())
order = [] order = []

8
openlp/plugins/songs/lib/foilpresenterimport.py
View File

@ -212,9 +212,13 @@ class FoilPresenter(object):
# No xml get out of here. # No xml get out of here.
if not xml: if not xml:
return None return None
song = Song()
if xml[:5] == u'<?xml': if xml[:5] == u'<?xml':
xml = xml[38:] xml = xml[38:]
song = Song()
# Values will be set when cleaning the song.
song.search_lyrics = u''
song.verse_order = u''
song.search_title = u''
# Because "text" seems to be an reserverd word, we have to recompile it. # Because "text" seems to be an reserverd word, we have to recompile it.
xml = re.compile(u'<text>').sub(u'<text_>', xml) xml = re.compile(u'<text>').sub(u'<text_>', xml)
xml = re.compile(u'</text>').sub(u'</text_>', xml) xml = re.compile(u'</text>').sub(u'</text_>', xml)
@ -482,7 +486,6 @@ class FoilPresenter(object):
numberx = temp_sortnr_liste[int(number)] numberx = temp_sortnr_liste[int(number)]
verse_order.append(temp_verse_order[unicode(numberx)]) verse_order.append(temp_verse_order[unicode(numberx)])
song.verse_order = u' '.join(verse_order) song.verse_order = u' '.join(verse_order)
song.search_lyrics = u''
def _process_songbooks(self, foilpresenterfolie, song): def _process_songbooks(self, foilpresenterfolie, song):
""" """
@ -533,7 +536,6 @@ class FoilPresenter(object):
song.alternate_title = u'' song.alternate_title = u''
else: else:
song.alternate_title = self._child(titelstring) song.alternate_title = self._child(titelstring)
song.search_title = u''
def _process_topics(self, foilpresenterfolie, song): def _process_topics(self, foilpresenterfolie, song):
""" """