openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/general into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #634771 in OpenLP: "OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start"
  https://bugs.launchpad.net/openlp/+bug/634771
  Bug #646718 in OpenLP: "Songbook, Number will not loaded, Title will not be saved"
  https://bugs.launchpad.net/openlp/+bug/646718
  Bug #696013 in OpenLP: "song import from powerpoint crashes every second time"
  https://bugs.launchpad.net/openlp/+bug/696013
  Bug #696021 in OpenLP: "presentation loader does not work fine in Windows using Powerpoint Viewer 2007"
  https://bugs.launchpad.net/openlp/+bug/696021
  Bug #696637 in OpenLP: "Alert not positioned correctly in single screen"
  https://bugs.launchpad.net/openlp/+bug/696637
  Bug #727732 in OpenLP: "Openlp 1.9.?? crashes on start"
  https://bugs.launchpad.net/openlp/+bug/727732
  Bug #735039 in OpenLP: "Cannot import PowerPoint Presentations with PowerPoint 2010"
  https://bugs.launchpad.net/openlp/+bug/735039

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/general/+merge/85051

Fix the Songs of Fellowship Import. (looks like some refactoring broke it at some point)
Support the new book 5.
-- 
https://code.launchpad.net/~j-corwin/openlp/general/+merge/85051
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/general into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py	2011-11-26 20:32:47 +0000
+++ openlp/plugins/songs/lib/sofimport.py	2011-12-09 00:13:27 +0000
@@ -127,7 +127,7 @@
                 self.processParagraphText(text)
                 self.newSong()
                 text = u''
-            text += self.process_textportion(textportion)
+            text += self.processTextPortion(textportion)
             if textportion.BreakType in (PAGE_AFTER, PAGE_BOTH):
                 self.processParagraphText(text)
                 self.newSong()
@@ -202,8 +202,8 @@
             if boldtext.isdigit() and self.songNumber == '':
                 self.addSongNumber(boldtext)
                 return u''
+            text = self.uncapText(text)
             if self.title == u'':
-                text = self.uncap_text(text)
                 self.addTitle(text)
             return text
         if text.strip().startswith(u'('):
@@ -242,8 +242,12 @@
             self.songBook = u'Songs of Fellowship 2'
         elif int(song_no) <= 1690:
             self.songBook = u'Songs of Fellowship 3'
-        else:
+        elif int(song_no) <= 2200:
             self.songBook = u'Songs of Fellowship 4'
+        elif int(song_no) <= 2710:
+            self.songBook = u'Songs of Fellowship 5'
+        else:
+            self.songBook = u'Songs of Fellowship Other'
 
     def addTitle(self, text):
         """