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

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

Revision: 8111
          http://sourceforge.net/p/bigdata/code/8111
Author:   tobycraig
Date:     2014-04-11 21:16:50 +0000 (Fri, 11 Apr 2014)
Log Message:
-----------
User can now choose a custom filename when exporting data

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

Modified: branches/RDR/bigdata-war/src/html/index.html
===================================================================
--- branches/RDR/bigdata-war/src/html/index.html	2014-04-11 18:58:09 UTC (rev 8110)
+++ branches/RDR/bigdata-war/src/html/index.html	2014-04-11 21:16:50 UTC (rev 8111)
@@ -117,10 +117,20 @@
       </div>
 
       <div id="query-export" class="modal">
-        <select>
-        </select>
-        <button id="query-download-rdf">Export</button>
-        <button class="modal-cancel">Cancel</button>
+        <h1>Export</h1>
+        <p>
+          <label for="export-format">Format: </label>
+          <select id="export-format"></select>
+        </p>
+        <p>
+          <label for="export-filename">Filename: </label>
+          <input type="text" id="export-filename" value="export">
+          .<span id="export-filename-extension"></span>
+        </p>
+        <p>
+          <button id="query-download-rdf">Export</button>
+          <button class="modal-cancel">Cancel</button>
+        </p>
       </div>
 
       <div class="tab" id="explore-tab">

Modified: branches/RDR/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-11 18:58:09 UTC (rev 8110)
+++ branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-11 21:16:50 UTC (rev 8111)
@@ -478,7 +478,7 @@
    $('#query-response, #query-explanation, #query-tab .bottom *').hide();
 });
 
-$('#query-export-rdf').click(function() { showModal('query-export'); });
+$('#query-export-rdf').click(function() { updateExportFileExtension(); showModal('query-export'); });
 $('#query-export-csv').click(exportCSV);
 $('#query-export-json').click(exportJSON);
 $('#query-export-xml').click(exportXML);
@@ -494,25 +494,34 @@
 };
 
 for(var contentType in rdf_extensions) {
-   $('#query-export select').append('<option value="' + contentType + '">' + rdf_extensions[contentType][0] + '</option>');
+   $('#export-format').append('<option value="' + contentType + '">' + rdf_extensions[contentType][0] + '</option>');
 }
 
+$('#export-format').change(updateExportFileExtension);
+
+function updateExportFileExtension() {
+   $('#export-filename-extension').html(rdf_extensions[$('#export-format').val()][1]);
+}
+
 $('#query-download-rdf').click(function() {
-   var dataType = $(this).siblings('select').val();
+   var dataType = $('#export-format').val();
    var settings = {
       type: 'POST',
       data: JSON.stringify(QUERY_RESULTS),
       contentType: 'application/sparql-results+json',
       headers: { 'Accept': dataType },
-      success: function(data) { downloadRDFSuccess(data, dataType); },
+      success: function(data) { downloadRDFSuccess(data, dataType, $('#export-filename').val()); },
       error: downloadRDFError
    };
    $.ajax('/bigdata/sparql?workbench&convert', settings);
    $(this).siblings('.modal-cancel').click();
 });
 
-function downloadRDFSuccess(data, dataType) {
-   var filename = 'export.' + rdf_extensions[dataType][1];
+function downloadRDFSuccess(data, dataType, filename) {
+   if(filename == '') {
+      filename = 'export';
+   }
+   filename += '.' + rdf_extensions[dataType][1];
    downloadFile(data, dataType, filename);
 }
 

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