Changeset 36862

Timestamp:

2022-10-22T23:58:58+13:00 (18 months ago)

Author:

davidb

Message:

First, but admittedly crude, ajax ability to do AV recommendation

Location:

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia

Files:

• etc/collectionConfig.xml (modified) (6 diffs)
• js/av_document.js (modified) (2 diffs)

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/etc/collectionConfig.xml

@@ -605 +605 @@
         </button>
 
-        <!--
-        <button class="btn btn-primary" data-action="play">
+        
+        <button class="btn btn-primary" data-action="play" style="display: none;">
                   <i class="glyphicon glyphicon-play"></i>
                   Play /
@@ -612 +612 @@
                   Pause
         </button>
-        -->
+        
         
         <button class="btn btn-primary" onclick="AVPlayPause()">
@@ -634 +634 @@
       
       document.addEventListener('DOMContentLoaded', function() {
-        postInitWavesurfer(wavesurfer);
-/*    
+        //postInitWavesurfer(wavesurfer);
+      
         // Load audio from URL
         wavesurfer.load(gs.variables.mp3url);
@@ -656 +656 @@
           }
           });
-*/        
+          
       });
     </gsf:script>
@@ -721 +721 @@
                 Based on the start of this musical/sound art work:
                   </span>
-                  <input onclick="preSubmit(this.form);" type="submit" value="Make Arousal-Valence Recommendations"/>
+                  <input onclick="return preSubmit(this.form);" type="submit" value="Make Arousal-Valence Recommendations"/>
                 </div>
                 
@@ -732 +732 @@
                 </div>
               </form>
+              <div id="resultsAreaDiv">
+                
+                <xsl:text> </xsl:text>
+              </div>
               <hr/>
               <!--

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/js/av_document.js

@@ -27 +27 @@
     */
     
-    function preSubmit(form) 
-    {
-      // Note, the Arousal and Valence feature window values used is:
-      //   6 secs + 50% overlap
-      // So the Weka computed AV values are spaced out:
-      //   6s, 9s, 12s, ...
-
-      // clamp to ensure >= 6.0 secs 
-      var current_time = Math.max(6.0,wavesurfer.getCurrentTime());
-
-      wavesurfer.pause();
-
-      weka_segment = Math.round(current_time/3) * 3;
-      form.elements["s1.offset"].value = weka_segment;
-      
-      var arousal_val = parseFloat($('#arousal-val').text());
-      var valence_val = parseFloat($('#valence-val').text());
-
-      //console.log("arousal val = " + arousal_val);
-      //console.log("valence val = " + valence_val);
-
-      form.elements["s1.arousal"].value = arousal_val;
-      form.elements["s1.valence"].value = valence_val;
-      
+function preSubmit(form) 
+{
+    // Note, the Arousal and Valence feature window values used is:
+    //   6 secs + 50% overlap
+    // So the Weka computed AV values are spaced out:
+    //   6s, 9s, 12s, ...
+    
+    // clamp to ensure >= 6.0 secs 
+    var current_time = Math.max(6.0,wavesurfer.getCurrentTime());
+    
+    wavesurfer.pause();
+    
+    weka_segment = Math.round(current_time/3) * 3;
+    form.elements["s1.offset"].value = weka_segment;
+    
+    var arousal_val = parseFloat($('#arousal-val').text());
+    var valence_val = parseFloat($('#valence-val').text());
+    
+    form.elements["s1.arousal"].value = arousal_val;
+    form.elements["s1.valence"].value = valence_val;
+    
 
     /*
@@ -62 +59 @@
       var frameLength = Math.round(lengthInSecs*1000/250.0);
       form.elements["s1.length"].value = frameLength;
-      */
-      return true;
-    }
+    */
 
 
-/*
+    // trigger AJAX call
+    // a=q&sa=&rt=rd&s=AudioQuery&c=amc-essentia&startPage=1&s1.maxDocs=3&s1.hitsPerPage=3&q=ds_63309_22230&s1.query=ds_63309_22230&s1.offset=30&s1.length=200&s1.arousal=-0.013&s1.valence=0.001
 
-var currentPosIsZero = true;
+    var args = {
+    "a":  "q",
+    "rt": "rd",
+    "s": "AudioQuery",
+    "sa": "",
+    "c":  gs.cgiParams["c"],
+    "q":  gs.cgiParams["d"],
+    "s1.query":       gs.cgiParams["d"],
+    "s1.maxDocs":     form.elements["s1.maxDocs"].value,
+    "s1.hitsPerPage": form.elements["s1.hitsPerPage"].value,
+    "s1.offset":      form.elements["s1.offset"].value,
+    "s1.length":      form.elements["s1.length"].value,
+    "s1.arousal": arousal_val,
+    "s1.valence": valence_val,
+    "startPage": 1,
+    "excerptid": "resultsArea"
+    };
 
-document.addEventListener('DOMContentLoaded', function() {
-    // Load audio from URL
-    wavesurfer.load(gs.variables.mp3url);
+
+    var argsFixed = {
+    "a": "q",
+    "rt": "rd",
+    "s": "AudioQuery",
+    "sa": "",
+    "c": "amc-essentia",
+    "startPage": 1,
+    "s1.maxDocs": 3,
+    "s1.hitsPerPage": 3,
+    "q": "ds_63309_22230",
+    "s1.query": "ds_63309_22230",
+    "s1.offset": 30,
+    "s1.length": 200,
+    "s1.arousal": -0.013,
+    "s1.valence": 0.001,
+    "excerptid" : "resultsArea"
+    };
     
-    wavesurfer.on('audioprocess', function () {
-    var current_time = wavesurfer.getCurrentTime();
-    var current_time_rounded = Math.round(current_time * 10) / 10
-          var current_time_rounded = current_time.toFixed(1);
-    $('#audioCurrentPos').html(current_time_rounded + " secs");
+    var url = "https://mars.so-we-must-think.space/greenstone3/library";
+    
+    $.ajax({
+    method: "GET",
+    url: url,
+    data: args
+    })
+    .done(function( msg ) {
+        $('#resultsAreaDiv').html(msg);
+    //alert( "Data Saved: " + msg );
+    });
 
-    if (current_time == 0) {
-        currentPosIsZero = true;
-        $('#makeRecommendationFrom').html("Based on the start of this musical/sound art work: ");
-    }
-    else if (currentPosIsZero) {
-            currentPosIsZero = false;
-        $('#makeRecommendationFrom').html("Based on the current timeline position of this musical/sound art work: ");
-    }
-    });     
-});
-*/
+    // stop submit
+    return false;
+
+    //return true;
+}
+
 
 var currentPosIsZero = true;