Changeset 28748 for main/trunk/model-sites-dev

Timestamp:

2013-12-05T22:54:26+13:00 (10 years ago)

Author:

davidb

Message:

Updates to work with latest XSL files, restful URLs, etc

File:

• main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/etc/collectionConfig.xml (modified) (10 diffs)

main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/etc/collectionConfig.xml

@@ -7 +7 @@
   </metadataList>
   <displayItemList>
-    <displayItem assigned="true" lang="en" name="name">Redefining Boundaries</displayItem>
+    <displayItem assigned="true" lang="en" name="enumeratedName">4. Downie's Diversion</displayItem>
+    <displayItem assigned="true" lang="en" name="name">Downie's Diversion</displayItem>
     <displayItem assigned="true" lang="en" name="description"></displayItem>
   </displayItemList>
@@ -130 +131 @@
   <search type="audioDB" orthogonal="true" />
   
+<!--
+  <search type="jenaTDB" orthogonal="true" />
+-->
+
   <infodb type="jdbm"/>
 
@@ -136 +141 @@
       <plugin name="ZIPPlugin"/>
       <plugin name="GreenstoneXMLPlugin"/>
-      <plugin name="EmbeddedMetadataPlugin"/>
-      
+
+<!--
+      <plugin name="EmbeddedMetadataPlugin">
+    <option name="-process_exp" value="(?i)\.mp3$"/>
+      </plugin>
+-->
+      
+      <plugin name="SalamiMetadataBigCrunchPlugin"/>
+
       <plugin name="AudioDBPlugin">
     <option name="-compute_fft_features" value="true"/>
@@ -164 +176 @@
     </pluginList>
   </import>
+
+  <importOption name="OIDtype" value="incremental"/> 
 
   <browse>
@@ -329 +343 @@
       <xsl:template name="additionalHeaderContent">
     
-
     <xsl:call-template name="soundmanager2-header"/>
     <xsl:call-template name="js-mad-header"/>
@@ -386 +399 @@
     
     <!-- CAA = Content Analysis Algorithm -->
-    <xsl:variable name="cgiargCAAlgorithm">
+    <gsf:variable name="cgiargCAAlgorithm">
       <xsl:choose>
         <xsl:when test="/page/pageRequest/paramList/param[@name='p.caAlgorithm']/@value != ''"><xsl:value-of select="/page/pageRequest/paramList/param[@name='p.caAlgorithm']/@value"/></xsl:when>
         <xsl:otherwise>1</xsl:otherwise>
       </xsl:choose>
-    </xsl:variable>
+    </gsf:variable>
+
 
     <!-- *** -->
@@ -464 +478 @@
             var self_sim_png = source.replace(/\.(ogg|mp3|wav)$/,".png");
             var collect = "</xsl:text><xsl:value-of select="/page/pageResponse/collection/@name"/><xsl:text disable-output-escaping="yes">";
-
+            //var site = "</xsl:text><xsl:value-of select="/page/xsltparams/param[@name='site_name']"/><xsl:text disable-output-escaping="yes">";
+            var site = "</xsl:text><xsl:value-of select="$site_name"/><xsl:text disable-output-escaping="yes">";
           </xsl:text>
         </script>
@@ -494 +509 @@
           <xsl:call-template name="workflow-block"/>
 
-          <div id="controlMarker"/>
+          <div id="controlMarker"><xsl:comment> filler </xsl:comment></div>
 
           <div id="svg-canvas-overlay" style="position: relative">
@@ -664 +679 @@
         var urlParts = currentURL.split("#");
     newURL = urlParts.shift();
-        newURL += "&amp;p.yScaleSimImg="+rescaleSize;
+        //newURL += "&amp;p.yScaleSimImg="+rescaleSize;
+        newURL += "?p.yScaleSimImg="+rescaleSize;
     newURL += "#" + urlParts.join("#");
       }
@@ -688 +704 @@
         var urlParts = currentURL.split("#");
     newURL = urlParts.shift();
-        newURL += "&amp;p.caAlgorithm="+caIndexPos;
+        // newURL += "&amp;p.caAlgorithm="+caIndexPos;
+        newURL += "?p.caAlgorithm="+caIndexPos;
     newURL += "#" + urlParts.join("#");
       }