Merge lp:~phill-ridout/openlp/issue-507 into lp:openlp

[Phill]

A fix for issue 507. http://support.openlp.org/issues/507
The opensong database file contained verses containing sub-elements such as <i> tags. lxml considders the text of an element up until the first sub element.

[Andreas Preikschat (googol-deactivatedaccount)]

9 +from lxml import objectify, etree

No need for the etree import.

27 +

Double new line.

Please also add a docstring to your method.

review: Needs Fixing

[Andreas Preikschat (googol-deactivatedaccount)]

review: Approve

[Jonathan Corwin (j-corwin)]

If the text looks something like
AAA<i>BBB</i>CCC<i>DDD</i>EEE

Is CCC one of the subelements?

review: Needs Information

[Phill (phill-ridout)]

So assuming this was all wrapped in a verse tag, the <I> tags are
considered children. AAA is the text of the verse element.BBB is the text
of the first <I> element. CCC is the tail to the first <I> element. DDD is
the text of the second <I> element. EEE is the tail to the second <I>
element.
On Jun 18, 2012 11:36 PM, "Jonathan Corwin" <email address hidden> wrote:

> Review: Needs Information
>
> If the text looks something like
> AAA<i>BBB</i>CCC<i>DDD</i>EEE
>
> Is CCC one of the subelements?
> --
> https://code.launchpad.net/~phill-ridout/openlp/issue-507/+merge/110858
> You are the owner of lp:~phill-ridout/openlp/issue-507.
>

[Jonathan Corwin (j-corwin)]

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py	2012-04-04 07:26:51 +0000
+++ openlp/plugins/bibles/lib/opensong.py	2012-06-18 16:43:21 +0000
@@ -46,6 +46,22 @@
         BibleDB.__init__(self, parent, **kwargs)
         self.filename = kwargs['filename']
 
+    def get_text(self, element):
+        """
+        Recursively get all text in an objectify element and its child elements.
+
+        ``element``
+            An objectify element to get the text from
+        """
+        verse_text = u''
+        if element.text:
+            verse_text = element.text
+        for sub_element in element.iterchildren():
+            verse_text += self.get_text(sub_element)
+        if element.tail:
+            verse_text += element.tail
+        return verse_text   
+
     def do_import(self, bible_name=None):
         """
         Loads a Bible from file.
@@ -89,7 +105,7 @@
                             db_book.id,
                             int(chapter.attrib[u'n'].split()[-1]),
                             int(verse.attrib[u'n']),
-                            unicode(verse.text))
+                            unicode(self.get_text(verse)))
                     self.wizard.incrementProgressBar(unicode(translate(
                         'BiblesPlugin.Opensong', 'Importing %s %s...',
                         'Importing <book name> <chapter>...')) %