Skip to content

Commit 98bfb35

Browse files
committed
Revert relative paths, set up base service path for subdomain usage
1 parent f6d7afc commit 98bfb35

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

app/views/gnd.scala.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
<span class="icon-bar"></span>
3434
</button>
3535
<a class="navbar-brand" href="https://lobid.org/gnd">
36-
<img id="small-logo" src='../assets/images/favicon.png' alt="lobid-gnd"/>
36+
<img id="small-logo" src='@controllers.routes.Assets.versioned("images/favicon.png")' alt="lobid-gnd"/>
3737
</a>
3838
<a class="navbar-brand" id="small-gnd-logo-link" href="https://gnd.network">
39-
<img id="small-logo" src='../assets/images/gnd.png' alt="gnd.network"/>
39+
<img id="small-logo" src='@controllers.routes.Assets.versioned("images/gnd.png")' alt="gnd.network"/>
4040
</a>
4141
</div>
4242
<div class="navbar-collapse collapse" id="resources-nav">

app/views/reconcile.scala.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1>GND Reconciliation</h1>
1818

1919
<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>
2020

21-
<p>Service-URL: <code>@controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
21+
<p>Service-URL: <code>@controllers.HomeController.config("host")</code></p>
2222

2323
<h2>Daten und Werkzeuge</h2>
2424

@@ -48,11 +48,11 @@ <h2>API</h2>
4848
<h3>Allgemeine API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410">spec</a>)</small></h3>
4949

5050
<p><b>Service</b><br/>
51-
<code>curl @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code>
51+
<code>curl @controllers.HomeController.config("host")</code>
5252
<p><b>JSONP-callback</b><br/>
53-
<code>curl @controllers.HomeController.config("host")@routes.Reconcile.main("jsonp")</code>
53+
<code>curl @controllers.HomeController.config("host")?callback=jsonp</code>
5454
<p><b>CORS-header</b><br/>
55-
<code>curl --head @controllers.HomeController.config("host")@routes.Reconcile.reconcile() | grep Access-Control-Allow-Origin</code>
55+
<code>curl --head @controllers.HomeController.config("host") | grep Access-Control-Allow-Origin</code>
5656
</p>
5757

5858
<h3>View-API</h3>
@@ -62,9 +62,10 @@ <h3>View-API</h3>
6262

6363
<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>
6464

65-
@desc("Query: GET", routes.Reconcile.main(queries="{\"q1\":{\"query\":\"Twain, Mark\"}}"))
65+
<p><b>Query: GET</b><br/>
66+
<a href='@controllers.HomeController.config("host")/?queries={"q1":{"query":"Twain, Mark"}}'>/?queries={"q1":{"query":"Twain, Mark"}}</a>
6667
<p><b>Query: POST</b><br/>
67-
<code>curl --data 'queries={"q1":{"query":"Twain, Mark"}}' @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
68+
<code>curl --data 'queries={"q1":{"query":"Twain, Mark"}}' @controllers.HomeController.config("host")</code></p>
6869

6970
<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>
7071

@@ -78,8 +79,9 @@ <h3>Suggest-API <small>(<a href="https://www.w3.org/community/reports/reconcilia
7879
<h3>Data-extension-API</h3>
7980

8081
@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",""))
81-
@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\"}]}"))
82+
<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/>
83+
<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>
8284
<p><b>Extend: POST</b><br/>
83-
<code>curl --data 'extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}' @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
85+
<code>curl --data 'extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}' @controllers.HomeController.config("host")</code></p>
8486

8587
}

conf/application.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is the main configuration file for the application.
22
# https://www.playframework.com/documentation/latest/ConfigFile
33

4-
host : "https://lobid.org"
4+
host : "https://reconcile.lobid.org"
55

66
dontShowOnMainPage: ["1012979-0"]
77

0 commit comments

Comments
 (0)