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

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

Revision: 8451
          http://sourceforge.net/p/bigdata/code/8451
Author:   tobycraig
Date:     2014-06-05 23:58:49 +0000 (Thu, 05 Jun 2014)
Log Message:
-----------
Added namespace column to query history

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

Modified: branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/index.html
===================================================================
--- branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/index.html	2014-06-05 23:23:41 UTC (rev 8450)
+++ branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/index.html	2014-06-05 23:58:49 UTC (rev 8451)
@@ -137,6 +137,7 @@
             <thead>
               <tr>
                 <th>Time</th>
+                <th>Namespace</th>
                 <th>Query</th>
                 <th>Results</th>
               </tr>

Modified: branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/js/workbench.js	2014-06-05 23:23:41 UTC (rev 8450)
+++ branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/js/workbench.js	2014-06-05 23:58:49 UTC (rev 8451)
@@ -636,6 +636,7 @@
 
 function loadHistory() {
    EDITORS.query.setValue(this.innerText);
+   useNamespace($(this).prev('.query-namespace').text());
    EDITORS.query.focus();
 }
 
@@ -657,7 +658,7 @@
 
    // see if this query is already in the history
    $('#query-history tbody tr').each(function(i, row) {
-      if($(row).find('.query')[0].innerText == query) {
+      if($(row).find('.query')[0].innerText == query && $(row).find('.query-namespace').text() == NAMESPACE) {
          // clear the old results and set the time to now
          $(row).find('.query-time').text(new Date().toISOString());
          $(row).find('.query-results').text('...');
@@ -672,6 +673,7 @@
       // add this query to the history
       var row = $('<tr>').prependTo($('#query-history tbody'));
       row.append('<td class="query-time">' + new Date().toISOString() + '</td>');
+      row.append('<td class="query-namespace">' + NAMESPACE + '</td>');
       var cell = $('<td class="query">').appendTo(row);
       cell.text(query);
       cell.html(cell.html().replace('\n', '<br>'));

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