FIX (again) URL of /sparql service in "RDFViewer button for SPARQL co…

…nstruct queries" #149
jmvanel · Apr 28, 2017 · b3661fb · b3661fb
1 parent d0cea32
commit b3661fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scala/forms/src/main/scala/deductions/runtime/views/ToolsPage.scala b/scala/forms/src/main/scala/deductions/runtime/views/ToolsPage.scala
@@ -100,7 +100,8 @@ trait ToolsPage extends EnterButtons
     val ( servicesURIPrefix, isDNS) = servicesURIPrefix2
     println(s"servicesURIPrefix $servicesURIPrefix, is DNS $isDNS")
     val servicesURIPrefixEncoded = URLEncoder.encode(servicesURIPrefix, "UTF-8")
-    val servicesURL = s"$toolURLprefix$servicesURIPrefixEncoded$sparqlServicePrefix"
+    val toolURLprefixEncoded = URLEncoder.encode(toolURLprefix, "UTF-8")
+    val servicesURL = s"$toolURLprefixEncoded$servicesURIPrefixEncoded$sparqlServicePrefix"
     println(s"servicesURL $servicesURL")
 
     <button id={buttonId}

diff --git a/scala/forms_play/public/rdfviewer/rdf.js b/scala/forms_play/public/rdfviewer/rdf.js
@@ -592,7 +592,10 @@ function loader(url, doLoad) {
                     .error(function() {
                         $.getJSON("http://rdf-translator.appspot.com/convert/n3/rdf-json/"+url, doLoad)
                             .error(function() {
-                                alert("Could not load "+url);
+                                $.getJSON("http://rdf-translator.appspot.com/convert/json-ld/rdf-json/"+url, doLoad)
+                                    .error(function() {
+                                        alert("Could not load "+url);
+                                });
                             });
                     });
               });