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

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

Revision: 8461
          http://sourceforge.net/p/bigdata/code/8461
Author:   tobycraig
Date:     2014-06-10 22:02:47 +0000 (Tue, 10 Jun 2014)
Log Message:
-----------
Fixed namespace abbreviation of query results and added it to explore pane

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

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-10 21:38:02 UTC (rev 8460)
+++ branches/WORKBENCH_QUERY_HISTORY/bigdata-war/src/html/js/workbench.js	2014-06-10 22:02:47 UTC (rev 8461)
@@ -1176,7 +1176,7 @@
          } else {
             var uri = col.value;
             if(col.type == 'uri') {
-               uri = '<' + uri + '>';
+               uri = abbreviate(uri);
             }
          }
          var output = escapeHTML(uri).replace(/\n/g, '<br>');
@@ -1402,9 +1402,11 @@
 }
 
 function abbreviate(uri) {
-   for(var ns in NAMESPACE_SHORTCUTS) {
-      if(uri.indexOf(NAMESPACE_SHORTCUTS[ns]) == 0) {
-         return uri.replace(NAMESPACE_SHORTCUTS[ns], ns + ':');
+   for(var nsGroup in NAMESPACE_SHORTCUTS) {
+      for(var ns in NAMESPACE_SHORTCUTS[nsGroup]) {
+         if(uri.indexOf(NAMESPACE_SHORTCUTS[nsGroup][ns]) == 0) {
+            return uri.replace(NAMESPACE_SHORTCUTS[nsGroup][ns], ns + ':');
+         }
       }
    }
    return '<' + uri + '>';

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