From 98bfb35f9809fe82b1ef1525a05531a8fa492253 Mon Sep 17 00:00:00 2001
From: Fabian Steeg <steeg@hbz-nrw.de>
Date: Tue, 10 Sep 2024 08:53:10 +0200
Subject: [PATCH] Revert relative paths, set up base service path for subdomain
 usage

---
 app/views/gnd.scala.html       |  4 ++--
 app/views/reconcile.scala.html | 18 ++++++++++--------
 conf/application.conf          |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/views/gnd.scala.html b/app/views/gnd.scala.html
index 5c120eb..4a190e7 100644
--- a/app/views/gnd.scala.html
+++ b/app/views/gnd.scala.html
@@ -33,10 +33,10 @@
                         <span class="icon-bar"></span>
                     </button>
                     <a class="navbar-brand" href="https://lobid.org/gnd">
-                     <img id="small-logo" src='../assets/images/favicon.png' alt="lobid-gnd"/>
+                     <img id="small-logo" src='@controllers.routes.Assets.versioned("images/favicon.png")' alt="lobid-gnd"/>
                     </a>
                     <a class="navbar-brand" id="small-gnd-logo-link" href="https://gnd.network">
-                     <img id="small-logo" src='../assets/images/gnd.png' alt="gnd.network"/>
+                     <img id="small-logo" src='@controllers.routes.Assets.versioned("images/gnd.png")' alt="gnd.network"/>
                     </a>
                   </div>
                   <div class="navbar-collapse collapse" id="resources-nav">
diff --git a/app/views/reconcile.scala.html b/app/views/reconcile.scala.html
index 4dea2b9..06743a6 100644
--- a/app/views/reconcile.scala.html
+++ b/app/views/reconcile.scala.html
@@ -18,7 +18,7 @@ <h1>GND Reconciliation</h1>
 
   <p>Dieser Dienst ermöglicht den Abgleich eigener Daten mit der Gemeinsamen Normdatei, insbesondere mit OpenRefine, einem nicht nur im Bibliotheksbereich weitverbreiteten Werkzeug. OpenRefine bietet zahlreiche Funktionalitäten zur Bereinigung und Transformation von Daten, sowie zum Abgleich (Reconciliation) mit externen Datenquellen und zur Anreicherung auf Basis der abgeglichenen Daten. Dieser Dienst stellt die GND als eine solche Datenquelle in OpenRefine bereit. Der Dienst kann zugleich auch in anderen Anwendungen verwendet werden, z. B. im Bibliotheksmanagementsystem Alma über Alma Refine (s. <a href="https://reconciliation-api.github.io/census/clients/">weitere Clients</a>).</p>
 
-  <p>Service-URL: <code>@controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
+  <p>Service-URL: <code>@controllers.HomeController.config("host")</code></p>
 
   <h2>Daten und Werkzeuge</h2>
 
@@ -48,11 +48,11 @@ <h2>API</h2>
   <h3>Allgemeine API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410">spec</a>)</small></h3>
 
   <p><b>Service</b><br/>
-  <code>curl @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code>
+  <code>curl @controllers.HomeController.config("host")</code>
   <p><b>JSONP-callback</b><br/>
-  <code>curl @controllers.HomeController.config("host")@routes.Reconcile.main("jsonp")</code>
+  <code>curl @controllers.HomeController.config("host")?callback=jsonp</code>
   <p><b>CORS-header</b><br/>
-  <code>curl --head @controllers.HomeController.config("host")@routes.Reconcile.reconcile() | grep Access-Control-Allow-Origin</code>
+  <code>curl --head @controllers.HomeController.config("host") | grep Access-Control-Allow-Origin</code>
   </p>
 
   <h3>View-API</h3>
@@ -62,9 +62,10 @@ <h3>View-API</h3>
 
   <h3>Query-API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#reconciliation-queries">spec</a>)</small></h3>
 
-  @desc("Query: GET", routes.Reconcile.main(queries="{\"q1\":{\"query\":\"Twain, Mark\"}}"))
+  <p><b>Query: GET</b><br/>
+  <a href='@controllers.HomeController.config("host")/?queries={"q1":{"query":"Twain, Mark"}}'>/?queries={"q1":{"query":"Twain, Mark"}}</a>
   <p><b>Query: POST</b><br/>
-  <code>curl --data 'queries={"q1":{"query":"Twain, Mark"}}' @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
+  <code>curl --data 'queries={"q1":{"query":"Twain, Mark"}}' @controllers.HomeController.config("host")</code></p>
 
   <h3>Suggest-API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#suggest-services">spec</a>)</small></h3>
 
@@ -78,8 +79,9 @@ <h3>Suggest-API <small>(<a href="https://www.w3.org/community/reports/reconcilia
   <h3>Data-extension-API</h3>
 
   @desc("Property-proposals (<a href=\"https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#data-extension-property-proposals\">spec</a>)", routes.Reconcile.properties("","Work",""))
-  @desc("Extend: GET (<a href=\"https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#data-extension-service\">spec</a>)", routes.Reconcile.main(extend="{\"ids\":[\"1081942517\",\"4791358-7\"],\"properties\":[{\"id\":\"preferredName\"},{\"id\":\"firstAuthor\"}]}"))
+  <p><b>Query: GET (<a href=\"https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#data-extension-service\">spec</a>)</b><br/>
+  <a href='@controllers.HomeController.config("host")/?extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}'>/?extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}</a>
   <p><b>Extend: POST</b><br/>
-  <code>curl --data 'extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}' @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
+  <code>curl --data 'extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}' @controllers.HomeController.config("host")</code></p>
 
 }
diff --git a/conf/application.conf b/conf/application.conf
index 3f273ae..e251758 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -1,7 +1,7 @@
 # This is the main configuration file for the application.
 # https://www.playframework.com/documentation/latest/ConfigFile
 
-host : "https://lobid.org"
+host : "https://reconcile.lobid.org"
 
 dontShowOnMainPage: ["1012979-0"]