[Bigdata-commit] SF.net SVN: bigdata:[7995] branches/RDR/bigdata-war/src/html/js/workbench. js

[<tob...@us...>]

Revision: 7995
          http://sourceforge.net/p/bigdata/code/7995
Author:   tobycraig
Date:     2014-03-18 18:16:29 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
#843 - Fixed query cancellation in status tab

Modified Paths:
--------------
    branches/RDR/bigdata-war/src/html/js/workbench.js

Modified: branches/RDR/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/js/workbench.js	2014-03-18 09:41:01 UTC (rev 7994)
+++ branches/RDR/bigdata-war/src/html/js/workbench.js	2014-03-18 18:16:29 UTC (rev 7995)
@@ -787,25 +787,40 @@
 
 /* Status */
 
-$('#tab-selector a[data-target=status]').click(function(e) {
+$('#tab-selector a[data-target=status]').click(getStatus);
+
+function getStatus(e) {
+   if(e) {
+      e.preventDefault();
+   }
    $.get('/bigdata/status', function(data) {
-      var accepted = data.match(/Accepted query count=(\d+)/)[1];
-      var running = data.match(/Running query count=(\d+)/)[1];
-      var numbers = $(data).get(-1).textContent;
+      // get data inside a jQuery object
+      data = $('<div>').append(data);
+      getStatusNumbers(data);
+   });
+}
+
+function getStatusNumbers(data) {
+      var accepted = data.text().match(/Accepted query count=(\d+)/)[1];
+      var running = data.text().match(/Running query count=(\d+)/)[1];
+      var numbers = $(data).find('pre')[0].textContent;
       $('#accepted-query-count').html(accepted);
       $('#running-query-count').html(running);
       $('#status-numbers').html(numbers);
-   });
-});
+}
 
 $('#show-queries').click(function(e) {
    e.preventDefault();
    $.get('/bigdata/status?showQueries', function(data) {
+      // get data inside a jQuery object
+      data = $('<div>').append(data);
+
+      // update status numbers
+      getStatusNumbers(data);
+
       // clear current list
       $('#running-queries').empty();
 
-      // get data inside a jQuery object
-      data = $('<div>').append(data);
       data.find('h1').each(function(i, e) {
          // per running query, data is structured h1 form (with numbers/cancel data) h2 pre (with SPARQL)
          e = $(e);
@@ -834,7 +849,7 @@
    e.preventDefault();
    if(confirm('Cancel query?')) {
       var id = $(this).data('queryId');
-      $.post('/bigdata/?cancel&queryId=' + id);
+      $.post('/bigdata/status?cancelQuery&queryId=' + id, function() { getStatus(); });
       $(this).parents('li').remove();
    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.