Changeset 28747 for main


Ignore:
Timestamp:
2013-12-05T22:53:42+13:00 (10 years ago)
Author:
davidb
Message:

Mime type change to help with future diffs. Could be some other changes, but until the svn property is set, hard to see what they might be

Location:
main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/transform/pages
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/transform/pages/about.xsl

    • Property svn:mime-type changed from application/xml to text/plain
    r28433 r28747  
    4747
    4848
    49     <script src="{$httpPath}/script/browser-detect.js" type="text/javascript">
     49    <script src="{$httpPath}/script2/browser-detect.js" type="text/javascript">
    5050    /* space filler needed */
    5151    </script>
    … …  
    5555
    5656
    57 <h2>A Musical Web Observatory: </h2>
    58 
    59 <h3><i><font size="+2">Connecting People with Data, Documents, and Algorithms</font></i></h3>
    60 
     57<h2>Structured Audio in a Music Digital Library</h2>
     58
     59<!--
    6160<div style="background-color: #DD3611; color: white; padding: 4pt; margin-bottom: 6pt;">
    6261<table>
    … …  
    139138</table>
    140139</div>
    141 
    142 <p class="about">This project is currently work in progress.  The sequence of development so far has been:
     140-->
     141
     142<p class="about">
     143This digital library collection is derived from the American workset,
     144from the <a href="http://salami.lis.illinois.edu">SALAMI</a> project.
     145
     146</p>
     147
     148<p class="about">This music DL embodies the following:
    143149
    144150<style>

  • main/trunk/model-sites-dev/multimodal-mdl/collect/salami-ground-truth/transform/pages/document.xsl

    • Property svn:mime-type changed from application/xml to text/plain
    r28433 r28747  
    218218      <tr valign="top">
    219219        <td>Artist Summary</td>
    220         <td><i><gsf:metadata name="LastFM.LastFMArtistWikiSummary"/></i></td>
     220        <td>
     221              <i>
     222                <gsf:script>
     223                  var summary = gs.documentMetadata["LastFM_LastFMArtistWikiSummary"];
     224         
     225                  document.write(summary.replace("\n","&lt;br /&gt;"));       
     226                </gsf:script>
     227              </i>
     228            </td>
     229
    221230      </tr>
    222231     
    … …  
    265274          -->
    266275
    267           <table>
     276          <table style="width: 100%;">
    268277        <tr>
    269           <td>
     278          <td style="width: 200px;">
    270279            MusicBrainz song id:
    271280          </td>
    272281          <td>
    273             <a href="http://dbtune.org/musicbrainz/resource/track/{$musicbrainzsongid}" target="#musicbrainz">
     282            <a href="http://dbtune.org/musicbrainz/resource/track/{$musicbrainzsongid}" target="#musicbrainz" class="external">
    274283              <xsl:copy-of select="$musicbrainzsongid"/>
    275284            </a>
    … …  
    282291          </td>
    283292          <td>
    284             <a href="http://dbtune.org/musicbrainz/resource/record/{$musicbrainzalbumid}" target="#musicbrainz">
     293            <a href="http://dbtune.org/musicbrainz/resource/record/{$musicbrainzalbumid}" target="#musicbrainz" class="external">
    285294              <xsl:copy-of select="$musicbrainzalbumid"/>
    286295            </a>
    … …  
    293302          </td>
    294303          <td>
    295             <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz">
     304            <a href="http://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz" class="external">
    296305              <xsl:copy-of select="$musicbrainzartistid"/>
    297             </a>
    298           </td>
    299         </tr>
    300         <tr>
    301           <td colspan="2">       
    302             <a href="{$lastfmtrackurl}" target="#lastfm">
    303               <xsl:copy-of select="$lastfmtrackurl"/>
    304306            </a>
    305307          </td>
    … …  
    310312          </td>
    311313          <td>
    312             <a href="{$echonestsongid}" target="#echonestsongid">
     314            <a href="http://developer.echonest.com/api/v4/song/profile?api_key=8WNR9XTGCODO9G4YG&amp;format=xml&amp;id={$echonestsongid}" target="#echonestsongid" class="external">
     315
     316
     317
    313318              <xsl:copy-of select="$echonestsongid"/>
    314319            </a>
     320          </td>
     321        </tr>
     322        <tr>
     323          <td colspan="2">       
     324            <i>
     325              <a href="{$lastfmtrackurl}" target="#lastfm" class="external">
     326            <xsl:copy-of select="$lastfmtrackurl"/>
     327              </a>
     328            </i>
    315329          </td>
    316330        </tr>
    … …  
    479493    </div>
    480494
    481     <gsf:script src="{$httpCollection}/script/meandre-workflow/chromagram.js"/>
    482     <gsf:script src="{$httpCollection}/script/meandre-workflow/js-dynamic-mix.js"/>
     495    <gsf:script src="{$httpCollection}/script2/meandre-workflow/chromagram.js"/>
     496    <gsf:script src="{$httpCollection}/script2/meandre-workflow/js-dynamic-mix.js"/>
    483497   
    484498    <gsf:script>
    … …  
    521535      <div class="documenttext hide" style="color: white; background-color: rgb(40%,40%,20%); padding: 8px;">
    522536
    523         <textarea id="js-dynamic-code" style="width:100%; height: 520px; font-size: 60%">
     537        <textarea id="js-dynamic-code" style="width:100%; height: 520px; font-size: 90%">
    524538          <xsl:text disable-output-escaping="yes">
    525539
    … …  
    602616           id="svgContentAnalysisSegments"
    603617       width="100%" height="24"
    604            onLoadXX="svgCAStructuredInit({$cgiargCAAlgorithm})">
     618           onLoad="svgCAStructuredInit({$cgiargCAAlgorithm})">
    605619      </svg>
    606620    </div>
     621
     622
     623      <!-- **** now back in -->
     624
     625      <form id="UpdateCAForm" name="UpdateCAForm" method="get" action="{$library_name}"
     626        style="display: block; background-color: #dddddd; padding: 6px;">
     627    <div style="font-style: italics;">
     628     
     629      Show the song structure automatically computed by analyzing
     630      the audio data using algorithm:
     631<!--
     632      <select id="caaMenu" name="caAlgorithm">
     633        <option value="1">BV1</option>
     634        <option value="2">BV2</option>
     635        <option value="3">GP7</option>
     636        <option value="4">MHRAG2</option>
     637        <option value="5">MND1</option>
     638        <option value="6">WB1</option>
     639-->
     640<!--
     641        <option value="-1">or hide</option>
     642-->
     643<!--
     644      </select>:
     645-->
     646
     647      <select id="caaMenu" name="caAlgorithm" onchange="updateCAAlgorithm()">
     648          <xsl:for-each select="/page/pageResponse/document/metadataList/metadata[@name = 'json.seriesName']">
     649          <option>
     650            <xsl:attribute name='value'>
     651              <xsl:value-of disable-output-escaping="yes" select="position()"/>
     652            </xsl:attribute>           
     653            <xsl:if test="position() = $cgiargCAAlgorithm">
     654              <xsl:attribute name='selected'>selected</xsl:attribute>
     655            </xsl:if>
     656            <xsl:value-of disable-output-escaping="yes" select="."/>
     657          </option>
     658          </xsl:for-each>
     659      </select>
     660
     661      <gsf:foreach-metadata name="json.seriesData">
     662        <gsf:variable2 name="seriesData"><xsl:value-of disable-output-escaping="yes" select="."/></gsf:variable2>
     663        <gsf:variable name="seriesPos"><xsl:value-of disable-output-escaping="yes" select="position()"/></gsf:variable>
     664
     665        <gsf:script>
     666          var cleanedSeriesData = gs.variables.seriesData.replace(/\\n/g,"").replace(/\n/g," ");
     667          cleanedSeriesData = cleanedSeriesData.replace(/\"\".*?\"\"/g,"\"$1\"").replace(/;$/,"");
     668          //console.log("cleaned data = " + cleanedSeriesData);
     669          allData[gs.variables.seriesPos] = JSON.parse(cleanedSeriesData);
     670        </gsf:script>
     671      </gsf:foreach-metadata>
     672
     673<!--
     674
     675      <input type="button" name="Reload" value="Reload"
     676             onclick="updateCAAlgorithm()" />
     677-->
     678
     679
     680
     681    </div>
     682      </form>
     683
    607684  </xsl:template>
    608685 
    … …  
    658735
    659736    <form style="padding-left: 8px; padding-bottom: 0px;">
    660       <span class="vis-heading">On Pause:</span>
    661       <input type="checkbox" name="similarityMatrix" onclick="plotSimilarityMatrixWhenPaused(this)"/>Show Similarity Matrix
     737      <div style="float: left;">
     738        <span class="vis-heading">On Pause:</span>
     739        <input type="checkbox" name="similarityMatrix" onclick="plotSimilarityMatrixWhenPaused(this)"/>Show Similarity Matrix
     740      </div>
     741      <div style="float: left; padding-left: 140px;">
     742        <span class="vis-heading">Accelerated  Processing:</span>
     743        <input type="checkbox" name="acceleratedProcessingInput" onclick="acceleratedProcessingCheckbox(this)"/>&gt; realtime
     744        <span id="accProcStatus"></span>
     745      </div>
     746
    662747    </form>
    663     <hr/>
     748    <div style="clear: both; padding-top: 4px; padding-bottom: 4px;"><hr/></div>
    664749
    665750    </div>
    … …  
    778863-->
    779864
    780       <!-- **** currently not displayed -->
    781 
    782       <form id="UpdateCAForm" name="UpdateCAForm" method="get" action="{$library_name}" style="display: none;">
    783     <div style="font-style: italics;">
    784      
    785       Show the song structure automatically computed by analyzing
    786       the audio data using algorithm
    787 
    788       <select id="caaMenu" name="caAlgorithm">
    789         <option value="1">BV1</option>
    790         <option value="2">BV2</option>
    791         <option value="3">GP7</option>
    792         <option value="4">MHRAG2</option>
    793         <option value="5">MND1</option>
    794         <option value="6">WB1</option>
    795 
    796 <!--
    797         <option value="-1">or hide</option>
    798 -->
    799 
    800       </select>:
    801 
    802       <input type="button" name="Reload" value="Reload"
    803              onclick="updateCAAlgorithm()" />
    804 
    805     </div>
    806       </form>
    807 
    808865    <script>
    809866      <xsl:text disable-output-escaping="yes">
    … …  
    865922    </gsf:script>
    866923
     924<!--
    867925
    868926    <div id="original-turnstyle" style="margin: 6px;">
    … …  
    889947    });
    890948    </gsf:script>
    891 
     949-->
    892950
    893951  </xsl:template>
Note: See TracChangeset for help on using the changeset viewer.