Merge lp:~trb143/openlp/audit into lp:openlp

[Tim Bentley]

[Tim Bentley (trb143)]

Fix up audit database with copyright
Fix runtime errors from last merge.

This merge requires you to delete your audit database!

[Raoul Snyman (raoul-snyman)]

What's with the extra line in classes.py and meta.py?

review: Approve

=== modified file 'openlp/plugins/audit/auditplugin.py'
--- openlp/plugins/audit/auditplugin.py	2009-09-23 17:36:22 +0000
+++ openlp/plugins/audit/auditplugin.py	2009-09-24 04:55:20 +0000
@@ -116,7 +116,8 @@
             audititem.auditdate = datetime.today()
             audititem.audittime = datetime.now().time()
             audititem.title = auditData[0]
-            audititem.ccl_id = auditData[2]
+            audititem.copyright = auditData[2]
+            audititem.ccl_number = auditData[3]
             audititem.authors = u''
             for author in auditData[1]:
                 audititem.authors += author + u' '
@@ -129,14 +130,5 @@
         """
         self.auditActive = str_to_bool(
             self.config.get_config(u'audit active', False))
-        if self.auditFileNameNew == u'':
-            self.auditActive = False
-            self.ToolsAuditItem.setChecked(self.auditActive)
-            self.ToolsAuditItem.setEnabled(False)
-            return
+#        self.ToolsAuditItem.setChecked(self.auditActive)
         self.ToolsAuditItem.setEnabled(True)
-        if self.auditFileNameNew != self.auditFileName:
-            if self.auditFile is not None:
-                self.auditFile.close()
-            self.auditFile = open(self.auditFileNameNew, u'a')
-
 
=== modified file 'openlp/plugins/audit/lib/classes.py'
--- openlp/plugins/audit/lib/classes.py	2009-09-23 15:51:03 +0000
+++ openlp/plugins/audit/lib/classes.py	2009-09-24 04:55:20 +0000
@@ -22,6 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+
 class BaseModel(object):
     """
     BaseModel provides a base object with a set of generic functions
 
=== modified file 'openlp/plugins/audit/lib/meta.py'
--- openlp/plugins/audit/lib/meta.py	2009-09-22 19:37:36 +0000
+++ openlp/plugins/audit/lib/meta.py	2009-09-24 04:55:20 +0000
@@ -22,6 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+
 from sqlalchemy import MetaData
 from sqlalchemy.orm import scoped_session, sessionmaker
 
 
=== modified file 'openlp/plugins/audit/lib/tables.py'
--- openlp/plugins/audit/lib/tables.py	2009-09-23 16:33:30 +0000
+++ openlp/plugins/audit/lib/tables.py	2009-09-24 04:55:20 +0000
@@ -33,5 +33,6 @@
     Column(u'audittime', types.Time, index=True, nullable=False),
     Column(u'title', types.Unicode(255), nullable=False),
     Column(u'authors', types.Unicode(255), nullable=False),
-    Column(u'ccl_id', types.Unicode(65), nullable=False)
+    Column(u'copyright', types.Unicode(255)),
+    Column(u'ccl_number', types.Unicode(65))
 )
 
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2009-09-21 17:56:36 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2009-09-24 04:55:20 +0000
@@ -308,5 +308,5 @@
         raw_footer.append(unicode(
             translate(u'SongMediaItem', u'CCL Licence: ') + ccl))
         service_item.raw_footer = raw_footer
-        service_item.audit = [service_item.title, author_audit, ccl]
+        service_item.audit = [song.title, author_audit, song.copyright, song.ccli_number]
         return True