modified download methods

LinDA-tools · Nov 24, 2014 · 331824f · 331824f
1 parent ad4ab01
commit 331824f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/app/assets/javascripts/resources/querybuilder.js b/app/assets/javascripts/resources/querybuilder.js
@@ -442,7 +442,7 @@ QueryBuilder = {
             return $("#hdn_selector_property_uri").val();
         },
         checkbox_click : function(){
-            if(QueryBuilder.properties.will_show_properties_in_preview()){
+            if(QueryBuilder.properties.will_show_properties_in_preview() == true){
                 QueryBuilder.show_equivalent_sparql_query();
             }
         },

diff --git a/app/assets/javascripts/resources/sparql.js b/app/assets/javascripts/resources/sparql.js
@@ -41,7 +41,13 @@ SPARQL = {
     },
     download : {
         rdb : function(){
-            var download_url = Utils.rdf2any.server+Utils.rdf2any.actions.convert+"rdb-converter.sql?dataset="+QueryBuilder.datasets.get_selected()+"&query="+encodeURIComponent($("#txt_sparql_query").val());
+            var query = $("#txt_sparql_query").val();
+            if(QueryBuilder.properties.will_show_properties_in_preview() == true){
+                $("#btn_show_checked_properties_no").click();
+                query = $("#txt_sparql_query").val();
+                $("#btn_show_checked_properties_yes").click();
+            }
+            var download_url = Utils.rdf2any.server+Utils.rdf2any.actions.convert+"rdb-converter.sql?dataset="+QueryBuilder.datasets.get_selected()+"&query="+encodeURIComponent(query);
             var selected_class = QueryBuilder.classes.get_selected_class();
             if(selected_class != undefined && selected_class != ''){
                download_url += "&for_class="+selected_class;
@@ -50,7 +56,13 @@ SPARQL = {
             window.open(download_url);
         },
         csv : function(){
-            var download_url = Utils.rdf2any.server+Utils.rdf2any.actions.convert+"csv-converter.csv?dataset="+QueryBuilder.datasets.get_selected()+"&query="+encodeURIComponent($("#txt_sparql_query").val());
+            var query = $("#txt_sparql_query").val();
+            if(QueryBuilder.properties.will_show_properties_in_preview() == true){
+                $("#btn_show_checked_properties_no").click();
+                query = $("#txt_sparql_query").val();
+                $("#btn_show_checked_properties_yes").click();
+            }
+            var download_url = Utils.rdf2any.server+Utils.rdf2any.actions.convert+"csv-converter.csv?dataset="+QueryBuilder.datasets.get_selected()+"&query="+encodeURIComponent(query);
             var selected_class = QueryBuilder.classes.get_selected_class();
             if(selected_class != undefined && selected_class != ''){
                download_url += "&for_class="+selected_class;
@@ -71,7 +83,13 @@ SPARQL = {
             window.open(download_url);
         },
         configured : function(){
-            var download_url = Utils.rdf2any.server+Utils.rdf2any.actions.convert+"configured-converter?dataset="+QueryBuilder.datasets.get_selected()+"&query="+encodeURIComponent($("#txt_sparql_query").val());
+            var query = $("#txt_sparql_query").val();
+            if(QueryBuilder.properties.will_show_properties_in_preview() == true){
+                $("#btn_show_checked_properties_no").click();
+                query = $("#txt_sparql_query").val();
+                $("#btn_show_checked_properties_yes").click();
+            }
+            var download_url = Utils.rdf2any.server+Utils.rdf2any.actions.convert+"configured-converter?dataset="+QueryBuilder.datasets.get_selected()+"&query="+encodeURIComponent(query);
             download_url += "&for_class="+QueryBuilder.classes.get_selected_class();
             download_url += "&properties="+encodeURIComponent(QueryBuilder.properties.get_checked_properties()); 
             var str_variable_dictionary = "";