Changeset 03c6d2d in indico for indico/MaKaC/plugins/Collaboration/RecordingManager/common.py

Timestamp:

09/19/11 14:31:48 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

a3fc2e

Parents:

f2ec56

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (09/05/11 17:41:32)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (09/19/11 14:31:48)

Message:

[FTR] Add API to create recording link

• Allow other hooks but exporters in http api
• Support POST API requests
• Allow API hooks to require(&allow) POST
• Log successful POST API requests
• get rid of 'export' module name in http api
• Allow non-array results, allow db committing
• Closes #900

File:

• indico/MaKaC/plugins/Collaboration/RecordingManager/common.py (modified) (3 diffs)

indico/MaKaC/plugins/Collaboration/RecordingManager/common.py

@@ -24 +24 @@
 from MaKaC.conference import ConferenceHolder, Contribution
 from MaKaC.common.logger import Logger
-from MaKaC.errors import MaKaCError
+from MaKaC.errors import MaKaCError, NoReportError
 try:
     import MySQLdb
@@ -833 +833 @@
 #    Logger.get('RecMan').debug("in createIndicoLink()")
     # From IndicoID, get info
-    talkInfo = parseIndicoID(IndicoID)
+    try:
+        talkInfo = parseIndicoID(IndicoID)
+    except NoReportError:
+        return False
     obj = talkInfo["object"]
 
     # Only one link per talk allowed.
     if doesExistIndicoLink(obj):
-        pass
+        return True # consider it a success anyway
     else:
 #        Logger.get('RecMan').info("creating a new link in Indico for talk %s, CDS record %s" % (IndicoID, CDSID))
@@ -855 +858 @@
         material.setMainResource(videoLink)
         obj.addMaterial(material)
+        return True
 
 def doesExistIndicoLink(obj):