Changeset 28748


Ignore:
Timestamp:
2013-12-05T22:54:26+13:00 (9 years ago)
Author:
davidb
Message:

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

File:
1 edited

Legend:

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

    r28470 r28748  
    77  </metadataList>
    88  <displayItemList>
    9     <displayItem assigned="true" lang="en" name="name">Redefining Boundaries</displayItem>
     9    <displayItem assigned="true" lang="en" name="enumeratedName">4. Downie's Diversion</displayItem>
     10    <displayItem assigned="true" lang="en" name="name">Downie's Diversion</displayItem>
    1011    <displayItem assigned="true" lang="en" name="description"></displayItem>
    1112  </displayItemList>
     
    130131  <search type="audioDB" orthogonal="true" />
    131132 
     133<!--
     134  <search type="jenaTDB" orthogonal="true" />
     135-->
     136
    132137  <infodb type="jdbm"/>
    133138
     
    136141      <plugin name="ZIPPlugin"/>
    137142      <plugin name="GreenstoneXMLPlugin"/>
    138       <plugin name="EmbeddedMetadataPlugin"/>
    139      
     143
     144<!--
     145      <plugin name="EmbeddedMetadataPlugin">
     146    <option name="-process_exp" value="(?i)\.mp3$"/>
     147      </plugin>
     148-->
     149     
     150      <plugin name="SalamiMetadataBigCrunchPlugin"/>
     151
    140152      <plugin name="AudioDBPlugin">
    141153    <option name="-compute_fft_features" value="true"/>
     
    164176    </pluginList>
    165177  </import>
     178
     179  <importOption name="OIDtype" value="incremental"/>
    166180
    167181  <browse>
     
    329343      <xsl:template name="additionalHeaderContent">
    330344   
    331 
    332345    <xsl:call-template name="soundmanager2-header"/>
    333346    <xsl:call-template name="js-mad-header"/>
     
    386399   
    387400    <!-- CAA = Content Analysis Algorithm -->
    388     <xsl:variable name="cgiargCAAlgorithm">
     401    <gsf:variable name="cgiargCAAlgorithm">
    389402      <xsl:choose>
    390403        <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>
    391404        <xsl:otherwise>1</xsl:otherwise>
    392405      </xsl:choose>
    393     </xsl:variable>
     406    </gsf:variable>
     407
    394408
    395409    <!-- *** -->
     
    464478            var self_sim_png = source.replace(/\.(ogg|mp3|wav)$/,".png");
    465479            var collect = "</xsl:text><xsl:value-of select="/page/pageResponse/collection/@name"/><xsl:text disable-output-escaping="yes">";
    466 
     480            //var site = "</xsl:text><xsl:value-of select="/page/xsltparams/param[@name='site_name']"/><xsl:text disable-output-escaping="yes">";
     481            var site = "</xsl:text><xsl:value-of select="$site_name"/><xsl:text disable-output-escaping="yes">";
    467482          </xsl:text>
    468483        </script>
     
    494509          <xsl:call-template name="workflow-block"/>
    495510
    496           <div id="controlMarker"/>
     511          <div id="controlMarker"><xsl:comment> filler </xsl:comment></div>
    497512
    498513          <div id="svg-canvas-overlay" style="position: relative">
     
    664679        var urlParts = currentURL.split("#");
    665680    newURL = urlParts.shift();
    666         newURL += "&amp;p.yScaleSimImg="+rescaleSize;
     681        //newURL += "&amp;p.yScaleSimImg="+rescaleSize;
     682        newURL += "?p.yScaleSimImg="+rescaleSize;
    667683    newURL += "#" + urlParts.join("#");
    668684      }
     
    688704        var urlParts = currentURL.split("#");
    689705    newURL = urlParts.shift();
    690         newURL += "&amp;p.caAlgorithm="+caIndexPos;
     706        // newURL += "&amp;p.caAlgorithm="+caIndexPos;
     707        newURL += "?p.caAlgorithm="+caIndexPos;
    691708    newURL += "#" + urlParts.join("#");
    692709      }
Note: See TracChangeset for help on using the changeset viewer.