From b3661fb61930784ca4c928fb10db8c6275ce18d2 Mon Sep 17 00:00:00 2001
From: Jean-Marc Vanel <jeanmarc.vanel@gmail.com>
Date: Fri, 28 Apr 2017 23:04:05 +0200
Subject: [PATCH] FIX (again) URL of /sparql service in "RDFViewer button for
 SPARQL construct queries" #149

---
 .../src/main/scala/deductions/runtime/views/ToolsPage.scala  | 3 ++-
 scala/forms_play/public/rdfviewer/rdf.js                     | 5 ++++-
 2 files changed, 6 insertions(+), 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
index c8ddd3abc..f7b28134b 100644
--- 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
index d40dbb533..c78c8f3a3 100644
--- 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);
+                                });
                             });
                     });
               });