Add song conversion script

Remove conversion code as it did not work!
More Song for tidy ups

cnvdb.py

@@ -21,7 +21,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 import codecs
 import sys
 
-def convert_file(self, inname, outname):
+def convert_file(inname, outname):
     """
     Convert a file from another encoding into UTF-8.
 
@@ -35,7 +35,8 @@ def convert_file(self, inname, outname):
     writefile = codecs.open(outname, 'w', encoding='utf-8')
     for line in infile:
         #replace the quotes with quotes
-        line = line.replace(u'\'\'', u'\'')
+        #TODO fix double quotes
+        #line = line.replace(u'\'\'', u'@')
         writefile.write(line)
     infile.close()
     writefile.close()

openlp/plugins/songs/forms/editsongform.py

@@ -155,14 +155,14 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             if id == -1:
                 # Not Found
                 id = 0
-            book_name.setCurrentIndex(id)
+            self.SongbookCombo.setCurrentIndex(id)
         if self.song.theme_name is not None and len(self.song.theme_name) > 0:
-            id = self.SongbookCombo.findText(unicode(self.song.theme_name), QtCore.Qt.MatchExactly)
+            id = self.ThemeSelectionCombo.findText(unicode(self.song.theme_name), QtCore.Qt.MatchExactly)
             if id == -1:
                 # Not Found
                 id = 0
                 self.song.theme_name = None
-            self.SongbookCombo.setCurrentIndex(id)
+            self.ThemeSelectionCombo.setCurrentIndex(id)
         if len(title) > 1:
             self.AlternativeEdit.setText(title[1])
         if self.song.copyright is not None:

songcnv.sh

@@ -0,0 +1,5 @@
+/usr/bin/sqlite ~/.local/share/openlp/songs/songs.olp .dump > ~/.local/share/openlp/songs/songs.dmp
+./cnvdb.py ~/.local/share/openlp/songs/songs.dmp ~/.local/share/openlp/songs/songs.dmp2
+rm ~/.local/share/openlp/songs/songs.sqlite
+sqlite3 ~/.local/share/openlp/songs/songs.sqlite < ~/.local/share/openlp/songs/songs.dmp2
+./openlpcnv.pyw