Merge branch 'rppd_rpb-153-gndIdentifier' of https://github.com/hbz/l…

…obid-gnd into rppd Resolves #386 See https://rppd.lobid.org/search?q=NOT+_exists_:gndIdentifier
hbz · Apr 11, 2024 · f8f0349 · f8f0349
2 parents ed59e71 + cab10dd
commit f8f0349
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/controllers/HomeController.java b/app/controllers/HomeController.java
@@ -342,7 +342,8 @@ public Result authority(String id, String format) {
 		if (responseFormat == null || responseFormat == Accept.Format.JSON_LINES
 				|| format != null && format.contains(":")) {
 			return unsupportedMediaType(views.html.error.render(id, String.format(
-					"Unsupported for single resource: format=%s, accept=%s", format, request().acceptedTypes())));
+					"Unsupported for single resource: format=%s, accept=%s", format,
+					request().acceptedTypes()), allHits()));
 		}
 		String jsonLd = getAuthorityResource(id);
 		if (jsonLd == null) {
@@ -372,7 +373,7 @@ public Result authority(String id, String format) {
 			}
 		} catch (Exception e) {
 			Logger.error("Could not create response", e);
-			return internalServerError(views.html.error.render(id, e.getMessage()));
+			return internalServerError(views.html.error.render(id, e.getMessage(), allHits()));
 		}
 	}
 
@@ -476,7 +477,9 @@ public Result search(String q, String name, String place, String subject, String
 		if (responseFormat == null || Stream.of(RdfFormat.values()).map(RdfFormat::getParam)
 				.anyMatch(f -> f.equals(responseFormat.queryParamString))) {
 			return unsupportedMediaType(views.html.error.render(q,
-					String.format("Unsupported for search: format=%s, accept=%s", format, request().acceptedTypes())));
+					String.format("Unsupported for search: format=%s, accept=%s", format,
+							request().acceptedTypes()),
+					allHits()));
 		}
 		String queryString = buildQueryString(q, name, place, subject, publication, date);
 		queryString = (queryString == null || queryString.isEmpty()) ? "*" : queryString;
@@ -507,7 +510,7 @@ public Result search(String q, String name, String place, String subject, String
 		} catch (Throwable t) {
 			String message = t.getMessage() + (t.getCause() != null ? ", cause: " + t.getCause().getMessage() : "");
 			Logger.error("Error: {}", message);
-			return internalServerError(views.html.error.render(q, "Error: " + message));
+			return internalServerError(views.html.error.render(q, "Error: " + message, allHits()));
 		}
 	}
 

diff --git a/app/models/AuthorityResource.java b/app/models/AuthorityResource.java
@@ -75,7 +75,7 @@ private <T> List<T> get(String field) {
 	}
 
 	public String getId() {
-		return id.substring(id.startsWith(GND_PREFIX) ? GND_PREFIX.length() : RPPD_PREFIX.length());
+		return id.replace(GND_PREFIX, "").replace(RPPD_PREFIX, "");
 	}
 
 	public String getFullId() {

diff --git a/app/views/error.scala.html b/app/views/error.scala.html
@@ -1,8 +1,8 @@
 @* Copyright 2015-2018 Fabian Steeg, hbz. Licensed under the EPL 2.0 *@
 
-@(q: String, message: String)
+@(q: String, message: String, allHits: Long)
 
-@main(q, "Error") { 
+@main(q, "Error", allHits) { 
 	<div class="panel panel-danger footer">
 		<div class='panel-heading'>Fehler</div>
 		<div class='panel-body'>@message</div>

diff --git a/app/views/search.scala.html b/app/views/search.scala.html
@@ -201,7 +201,7 @@ <h5>@models.GndOntology.label("type")</h5>
                  </div>
                  <table class="table table-striped table-condensed">
                  <tr><th /><th /><th /><th /><th /></tr>
-                 @for((doc,i) <- hits; gndId = (doc\"gndIdentifier").as[String]; id = if (gndId.contains("Keine")) (doc\"rppdId").as[String] else gndId) {
+                 @for((doc,i) <- hits; gndId = (doc\"gndIdentifier").asOpt[String].getOrElse("Keine"); id = if (gndId.contains("Keine")) (doc\"rppdId").as[String] else gndId) {
                     @result_short(id,doc,i-1)
                  }
                  </table>