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

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

Revision: 7886
          http://sourceforge.net/p/bigdata/code/7886
Author:   tobycraig
Date:     2014-02-24 23:06:39 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Fixed query explanation and made it detailed.

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

Modified: branches/RDR/bigdata-war/src/html/new.html
===================================================================
--- branches/RDR/bigdata-war/src/html/new.html	2014-02-24 22:37:29 UTC (rev 7885)
+++ branches/RDR/bigdata-war/src/html/new.html	2014-02-24 23:06:39 UTC (rev 7886)
@@ -104,7 +104,7 @@
             <a href="#" id="advanced-features-toggle">Advanced features</a>
 
             <div id="advanced-features">
-              <input type="checkbox" name="explain" value="true" id="query-explain"> <label for="query-explain">Explain</label>
+              <input type="checkbox" name="explain" value="details" id="query-explain"> <label for="query-explain">Explain</label>
               <input type="checkbox" name="analytic" value="true" id="query-analytic"> <label for="query-analytic">Analytic</label>
               <input type="checkbox" name="RTO" value="true" id="query-rto"> <label for="query-rto">Runtime Query Optimizer</label>
             </div>

Modified: branches/RDR/bigdata-war/src/html/style.css
===================================================================
--- branches/RDR/bigdata-war/src/html/style.css	2014-02-24 22:37:29 UTC (rev 7885)
+++ branches/RDR/bigdata-war/src/html/style.css	2014-02-24 23:06:39 UTC (rev 7886)
@@ -106,6 +106,7 @@
    border: 1px solid;
    border-bottom: none;
    min-height: 100px;
+   overflow-x: scroll;
 }
 
 .box:last-of-type {
@@ -171,3 +172,7 @@
    padding: 2px;
 }
 
+pre {
+   font-family: monospace;
+}
+

Modified: branches/RDR/bigdata-war/src/html/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/workbench.js	2014-02-24 22:37:29 UTC (rev 7885)
+++ branches/RDR/bigdata-war/src/html/workbench.js	2014-02-24 23:06:39 UTC (rev 7886)
@@ -250,11 +250,18 @@
    var settings = {
       type: 'POST',
       data: $(this).serialize(),
-      dataType: 'json',
-      accepts: {'json': 'application/sparql-results+json'},
       success: showQueryResults,
       error: queryResultsError
    }
+
+   // queries return JSON, explanations return HTML
+   if($('#query-explain').is(':checked')) {
+      settings.dataType = 'html';
+   } else {
+      settings.dataType = 'json';
+      settings.accepts =  {'json': 'application/sparql-results+json'};
+   }
+
    $.ajax('/sparql', settings);
    return false;
 });
@@ -264,25 +271,28 @@
 });
 
 function showQueryResults(data) {
-   $('#query-response').html('');
-   var table = $('<table>').appendTo($('#query-response'));
-   var thead = $('<thead>').appendTo(table);
-   var vars = [];
-   var tr = $('<tr>');
-   for(var i=0; i<data.head.vars.length; i++) {
-      tr.append('<td>' + data.head.vars[i] + '</td>');
-      vars.push(data.head.vars[i]);
-   }
-   thead.append(tr);
-   table.append(thead);
-   for(var i=0; i<data.results.bindings.length; i++) {
+   if(this.dataType == 'html') {
+      $('#query-response').html(data);
+   } else {
+      $('#query-response').html('');
+      var table = $('<table>').appendTo($('#query-response'));
+      var thead = $('<thead>').appendTo(table);
+      var vars = [];
       var tr = $('<tr>');
-      for(var j=0; j<vars.length; j++) {
-         tr.append('<td>' + data.results.bindings[i][vars[j]].value + '</td>');
+      for(var i=0; i<data.head.vars.length; i++) {
+         tr.append('<td>' + data.head.vars[i] + '</td>');
+         vars.push(data.head.vars[i]);
       }
-      table.append(tr);
+      thead.append(tr);
+      table.append(thead);
+      for(var i=0; i<data.results.bindings.length; i++) {
+         var tr = $('<tr>');
+         for(var j=0; j<vars.length; j++) {
+            tr.append('<td>' + data.results.bindings[i][vars[j]].value + '</td>');
+         }
+         table.append(tr);
+      }
    }
-
 }
 
 function queryResultsError(jqXHR, textStatus, errorThrown) {

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