From 3ce692bbac04215443a372fa8f497391fadf3160 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Thu, 24 Sep 2009 05:31:33 +0100
Subject: [PATCH] Fix audit to not crash, add copyright to DB and fix CCL

---
 openlp/plugins/audit/auditplugin.py   | 14 +++-----------
 openlp/plugins/audit/lib/tables.py    |  3 ++-
 openlp/plugins/songs/lib/mediaitem.py |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/openlp/plugins/audit/auditplugin.py b/openlp/plugins/audit/auditplugin.py
index 7acd9c647..113b7321d 100644
--- a/openlp/plugins/audit/auditplugin.py
+++ b/openlp/plugins/audit/auditplugin.py
@@ -116,7 +116,8 @@ class AuditPlugin(Plugin):
             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 @@ class AuditPlugin(Plugin):
         """
         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')
-
diff --git a/openlp/plugins/audit/lib/tables.py b/openlp/plugins/audit/lib/tables.py
index 9d7eb1551..0316fc2f3 100644
--- a/openlp/plugins/audit/lib/tables.py
+++ b/openlp/plugins/audit/lib/tables.py
@@ -33,5 +33,6 @@ audit_table = Table(u'audit_data', metadata,
     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), nullable=False),
+    Column(u'ccl_number', types.Unicode(65), nullable=False)
 )
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index c18d8d91c..68ea1fee5 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -308,5 +308,5 @@ class SongMediaItem(MediaManagerItem):
         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 = [service_item.title, author_audit,song.copyright, unicode(song.ccli_number)]
         return True