Skip to content

Commit a02f4c6

Browse files
fsteegfsteeg
committed
Set up assets links and base service path for subdomain usage
1 parent f6d7afc commit a02f4c6

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

‎app/views/gnd.scala.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
<html lang="de">
88
<head>
99
<title>@title</title>
10-
<link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/bootstrap.min.css")">
11-
<link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/octicons.css")">
12-
<link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/jquery-ui.min.css")">
13-
<link rel="stylesheet" media="all" href='@controllers.routes.Assets.versioned("stylesheets/font-awesome.min.css")'>
14-
<link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/main.css")">
15-
<link rel="shortcut icon" type="image/png" href="@controllers.routes.Assets.versioned("images/gnd.png")">
16-
<script src="@controllers.routes.Assets.versioned("javascripts/jquery-1.10.2.min.js")"></script>
17-
<script src="@controllers.routes.Assets.versioned("javascripts/jquery-ui.min.js")"></script>
18-
<script src="@controllers.routes.Assets.versioned("javascripts/bootstrap.min.js")"></script>
19-
<script src="@controllers.routes.Assets.versioned("javascripts/main.js")"></script>
10+
<link rel="stylesheet" media="all" href="../assets/stylesheets/bootstrap.min.css">
11+
<link rel="stylesheet" media="all" href="../assets/stylesheets/octicons.css">
12+
<link rel="stylesheet" media="all" href="../assets/stylesheets/jquery-ui.min.css">
13+
<link rel="stylesheet" media="all" href="../assets/stylesheets/font-awesome.min.css">
14+
<link rel="stylesheet" media="all" href="../assets/stylesheets/main.css">
15+
<link rel="shortcut icon" type="image/png" href="../assets/images/gnd.png">
16+
<script src="../assets/javascripts/jquery-1.10.2.min.js"></script>
17+
<script src="../assets/javascripts/jquery-ui.min.js"></script>
18+
<script src="../assets/javascripts/bootstrap.min.js"></script>
19+
<script src="../assets/javascripts/main.js"></script>
2020
<meta name="viewport" content="width=device-width, initial-scale=1">
2121
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE10">
2222
</head>
@@ -61,7 +61,7 @@
6161
<div class="panel panel-default footer-gnd">
6262
<div class="panel-body">
6363
<span class="pull-left">
64-
<img id='small-logo' src='@controllers.routes.Assets.versioned("images/gnd.png")' alt="GND-Logo"/> &nbsp;
64+
<img id='small-logo' src='../assets/images/gnd.png' alt="GND-Logo"/> &nbsp;
6565
GND Reconciliation | ein Dienst im <a href='https://gnd.network'>gnd.network</a>
6666
</span>
6767
<span class="pull-right">

‎app/views/reconcile.scala.html

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
@gnd("GND Reconciliation") {
1010
<div class='pull-right'>
11-
<img src='@controllers.routes.Assets.versioned("images/gnd.png")' height='85px'/>
12-
<img src='@controllers.routes.Assets.versioned("images/refine.png")' height='100px'/>
11+
<img src='../assets/images/gnd.png' height='85px'/>
12+
<img src='../assets/images/refine.png' height='100px'/>
1313
</div>
1414

1515
<h1>GND Reconciliation</h1>
@@ -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)