raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix audit to not crash, add copyright to DB and fix CCL

Browse Source
This commit is contained in:
Tim Bentley 2009-09-24 05:31:33 +01:00
parent 44ecfe6dd3
commit 3ce692bbac
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/plugins/audit/auditplugin.py
View File

@ -116,7 +116,8 @@ class AuditPlugin(Plugin):
audititem.auditdate = datetime.today() audititem.auditdate = datetime.today()
audititem.audittime = datetime.now().time() audititem.audittime = datetime.now().time()
audititem.title = auditData[0] audititem.title = auditData[0]
audititem.ccl_id = auditData[2] audititem.copyright = auditData[2]
audititem.ccl_number = auditData[3]
audititem.authors = u'' audititem.authors = u''
for author in auditData[1]: for author in auditData[1]:
audititem.authors += author + u' ' audititem.authors += author + u' '
@ -129,14 +130,5 @@ class AuditPlugin(Plugin):
""" """
self.auditActive = str_to_bool( self.auditActive = str_to_bool(
self.config.get_config(u'audit active', False)) self.config.get_config(u'audit active', False))
if self.auditFileNameNew == u'': # self.ToolsAuditItem.setChecked(self.auditActive)
self.auditActive = False
self.ToolsAuditItem.setChecked(self.auditActive)
self.ToolsAuditItem.setEnabled(False)
return
self.ToolsAuditItem.setEnabled(True) 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')

3
openlp/plugins/audit/lib/tables.py
View File

@ -33,5 +33,6 @@ audit_table = Table(u'audit_data', metadata,
Column(u'audittime', types.Time, index=True, nullable=False), Column(u'audittime', types.Time, index=True, nullable=False),
Column(u'title', types.Unicode(255), nullable=False), Column(u'title', types.Unicode(255), nullable=False),
Column(u'authors', 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)
) )

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -308,5 +308,5 @@ class SongMediaItem(MediaManagerItem):
raw_footer.append(unicode( raw_footer.append(unicode(
translate(u'SongMediaItem', u'CCL Licence: ') + ccl)) translate(u'SongMediaItem', u'CCL Licence: ') + ccl))
service_item.raw_footer = raw_footer 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 return True