Changeset 3e6afb in indico

Timestamp:

06/10/10 18:11:33 (3 years ago)

Author:

Jeremy Herr <jeremy.herr@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

57e653

Parents:

b3195a

git-author:

Jeremy Herr <jeremy.herr@…> (03/25/10 18:05:39)

git-committer:

Jeremy Herr <jeremy.herr@…> (06/10/10 18:11:33)

Message:

[IMP] plain_video vs web_lecture MARC XML working

A lot of small fixes to get the two different modes working...

• moved JavaScript? var initialization to end of NewBookingForm?.tpl to make sure they get loaded first
• services.py checks for different vars depending on which mode we're in (plain_video or web_lecture)
• replaced a hard-coded / file separator with os.path.join()
• other misc changes

Also, set the height of both panes to be the same height, so all the buttons etc are always within the window all the time.

Location:

indico/MaKaC/plugins/Collaboration/RecordingManager

Files:

• Style.css (modified) (1 diff)
• common.py (modified) (3 diffs)
• output.py (modified) (2 diffs)
• services.py (modified) (1 diff)
• tpls/Extra.js (modified) (2 diffs)
• tpls/NewBookingForm.tpl (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/RecordingManager/Style.css

@@ -24 +24 @@
     margin-top: 10px;
     margin-bottom: 10px;
-    min-height: 300px;
-    max-height: 450px;
+    height: 450px;
     overflow: auto;
 }

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

@@ -348 +348 @@
     return (rows)
 
-def updateMicala(IndicoID, LOID):
+def updateMicala(IndicoID, contentType, LOID):
     """Submit Indico ID to the micala DB"""
 
 #    Logger.get('RecMan').exception("inside updateMicala.")
 
-    try:
-        connection = MySQLdb.connect(host   = CollaborationTools.getOptionValue("RecordingManager", "micalaDBServer"),
-                                     port   = int(CollaborationTools.getOptionValue("RecordingManager", "micalaDBPort")),
-                                     user   = CollaborationTools.getOptionValue("RecordingManager", "micalaDBUser"),
-                                     passwd = CollaborationTools.getOptionValue("RecordingManager", "micalaDBPW"),
-                                     db     = CollaborationTools.getOptionValue("RecordingManager", "micalaDBName"))
-    except MySQLdb.Error, e:
-        raise RecordingManagerException("MySQL database error %d: %s" % (e.args[0], e.args[1]))
-
-    cursor = connection.cursor(cursorclass=MySQLdb.cursors.DictCursor)
-
-    try:
-        cursor.execute("UPDATE Lectures SET IndicoID=%s WHERE id=%s",
-                       (IndicoID, LOID))
-        connection.commit()
-    except MySQLdb.Error, e:
-        raise RecordingManagerException("MySQL database error %d: %s" % (e.args[0], e.args[1]))
-
-    cursor.close()
-    connection.close()
-
-def createCDSRecord(IndicoID, aw, videoFormat):
+    if contentType == 'web_lecture':
+        try:
+            connection = MySQLdb.connect(host   = CollaborationTools.getOptionValue("RecordingManager", "micalaDBServer"),
+                                         port   = int(CollaborationTools.getOptionValue("RecordingManager", "micalaDBPort")),
+                                         user   = CollaborationTools.getOptionValue("RecordingManager", "micalaDBUser"),
+                                         passwd = CollaborationTools.getOptionValue("RecordingManager", "micalaDBPW"),
+                                         db     = CollaborationTools.getOptionValue("RecordingManager", "micalaDBName"))
+        except MySQLdb.Error, e:
+            raise RecordingManagerException("MySQL database error %d: %s" % (e.args[0], e.args[1]))
+
+        cursor = connection.cursor(cursorclass=MySQLdb.cursors.DictCursor)
+
+        try:
+            cursor.execute("UPDATE Lectures SET IndicoID=%s WHERE id=%s",
+                           (IndicoID, LOID))
+            connection.commit()
+        except MySQLdb.Error, e:
+            raise RecordingManagerException("MySQL database error %d: %s" % (e.args[0], e.args[1]))
+
+        cursor.close()
+        connection.close()
+
+    elif contentType == 'plain_video':
+        # Should update the database here as well.
+        # first need to backup the DB, create a new column called contentType
+        # (I already created this column in micala.sql, just need to recreate DB from this file)
+        pass
+
+def createCDSRecord(aw, IndicoID, contentType, videoFormat):
     '''Retrieve a MARC XML string for the given conference, then package it up and send it to CDS.'''
 
@@ -380 +387 @@
     xmlGen = XMLGen()
     xmlGen.initXml()
-    di = DataInt(xmlGen)
-#    og = outputGenerator(aw, dataInt=di)
+
     og = outputGenerator(aw, xmlGen)
 
@@ -426 +432 @@
 
     outputData = ""
-    stylepath = "%s/%s.xsl" % (Config.getInstance().getStylesheetsDir(),
-                               'cds_marcxml_presentation')
-    if os.path.exists(stylepath):
+    stylePath  = ""
+
+    if parsed["type"] == 'contribution':
+        stylePath = "%s.xsl" % (os.path.join(Config.getInstance().getStylesheetsDir(),
+                                             'cds_marcxml_video_contribution'))
+    else:
+        stylePath = "%s.xsl" % (os.path.join(Config.getInstance().getStylesheetsDir(),
+                                             'cds_marcxml_video_presentation'))
+
+    if os.path.exists(stylePath):
         try:
-            Logger.get('RecMan').info("Trying to do XSLT using path %s" % stylepath)
-            parser = XSLTransformer(stylepath)
+            Logger.get('RecMan').info("Trying to do XSLT using path %s" % stylePath)
+            parser = XSLTransformer(stylePath)
             outputData = parser.process(marcxml)
         except:

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

@@ -2 +2 @@
 from MaKaC.user import Avatar
 from MaKaC.user import CERNGroup
+
+from MaKaC.common.logger import Logger
 
 class MarcAccessListGenerator():
@@ -82 +84 @@
         """Generate XML variables needed for video records."""
 
+        Logger.get('RecMan').info("videoFormat = %s" % videoFormat)
+
         videoTagStandard = CollaborationTools.getOptionValue("RecordingManager", "videoFormatStandard")
         videoTagWide     = CollaborationTools.getOptionValue("RecordingManager", "videoFormatWide")

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

@@ -51 +51 @@
         self._confId      = self._params.get('conference', None)
         self._videoFormat = self._params.get('videoFormat', None)
+        self._contentType = self._params.get('contentType', None)
 
+        if not self._contentType:
+            raise RecordingManagerException("No content type supplied (plain video or web lecture)")
         if not self._IndicoID:
             raise RecordingManagerException("No IndicoID supplied")
-        if not self._LOID:
-            raise RecordingManagerException("No LOID supplied")
+
+        if self._contentType == 'web_lecture':
+            if not self._LOID:
+                raise RecordingManagerException("No LOID supplied")
+        elif self._contentType == 'plain_video':
+            if not self._videoFormat:
+                raise RecordingManagerException("No video format supplied")
+
         if not self._confId:
             raise RecordingManagerException("No conference ID supplied")
-        if not self._videoFormat:
-            raise RecordingManagerException("No video format supplied")
 
     def _getAnswer(self):
         # Update the micala database
-        resultUpdateMicala = updateMicala(self._IndicoID, self._params.get('LOID', None))
+        resultUpdateMicala = updateMicala(self._IndicoID,
+                                          self._contentType,
+                                          self._params.get('LOID', None))
 
         # Get the MARC XML and submit it to CDS
-        resultCreateCDSRecord = createCDSRecord(self._IndicoID, self._aw, self._videoFormat)
+        resultCreateCDSRecord = createCDSRecord(self._aw,
+                                                self._IndicoID,
+                                                self._contentType,
+                                                self._videoFormat)
 
 #        raise RecordingManagerException("got this far")

indico/MaKaC/plugins/Collaboration/RecordingManager/tpls/Extra.js

@@ -234 +234 @@
 
 // jherr stuff
-var RMselectedTalkId   = '';
-var RMselectedLOID     = '';
-var RMselectedTalkName = '';
-var RMselectedLOName   = '';
-var RMviewMode         = '';
-var RMvideoFormat      = 'standard';
 
 function RMbuttonModeSelect(mode) {
@@ -412 +406 @@
                 IndicoID: RMselectedTalkId,
                 LOID: RMselectedLOID,
-                videoFormat: RMvideoFormat
+                videoFormat: RMvideoFormat,
+                contentType: RMviewMode
             },
         function(result, error){

indico/MaKaC/plugins/Collaboration/RecordingManager/tpls/NewBookingForm.tpl

@@ -138 +138 @@
     var RM_orphans = <%= jsonEncode(Orphans) %>;
 
+    var RMselectedTalkId   = '';
+    var RMselectedLOID     = '';
+    var RMselectedTalkName = '';
+    var RMselectedLOName   = '';
+    var RMviewMode         = '';
+    var RMvideoFormat      = 'standard';
+
     // Draw the two buttons, which start out as disabled until
     // the user has selected both talk and LO