Merge branch '414-errors' of https://github.com/hbz/lobid-organisations

Resolves #414

See http://lobid.org/organisations/search?q=%2B%2Btest

app/controllers/Application.java

@@ -354,9 +354,13 @@ location, from, size, responseFormat, lang().code(),
 			Logger.debug("Caching search result for request: {}", cacheKey);
 			Cache.set(cacheKey, searchResult, ONE_DAY);
 			return searchResult;
-		} catch (IllegalArgumentException x) {
-			Logger.warn("Bad request: ", x.getMessage());
-			return badRequest("Bad request: " + x.getMessage());
+		} 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));
 		}
 	}
 
@@ -402,10 +406,10 @@ private static Result searchResult(String q, String location, int from,
 		results.put("js", () -> {
 			String queryResultString =
 					searchQueryResult(q, location, from, size, "location");
-			String queryMetadata =
-					Json.parse(queryResultString).get("aggregation").toString();
-			JavaScript script =
-					views.js.facet_map.render(queryMetadata, q, location, from, size);
+			JsonNode queryMetadata = Json.parse(queryResultString).get("aggregation");
+			JavaScript script = views.js.facet_map.render(
+					queryMetadata == null ? "{}" : queryMetadata.toString(), q, location,
+					from, size);
 			return ok(script).as("application/javascript; charset=utf-8");
 		});
 		results.put("csv", () -> {

app/views/error.scala.html

@@ -0,0 +1,12 @@
+@* Copyright 2018 Fabian Steeg, hbz. Licensed under the GPLv2 *@
+
+@(q: String, message: String)
+
+@import play.i18n._
+
+@main(q) { 
+	<div class="panel panel-danger footer">
+		<div class='panel-heading'>@Messages.get("error")</div>
+		<div class='panel-body'>@message</div>
+	</div>
+}

app/views/search.scala.html

@@ -55,7 +55,7 @@ <h4>@Messages.get("search." + key.split("\\.")(0))</h4>
 
 @defining(Json.parse(json)) { jsonResponse =>
 @main(q, location, facetMap()) {
-	@defining((jsonResponse\"member").as[Seq[JsValue]]) { orgs => @if(orgs.size > 0) {
+	@defining((jsonResponse\"member").asOpt[Seq[JsValue]].getOrElse(Seq())) { orgs => @if(orgs.size > 0) {
 	<div class="row" id="search-results">
 		<div class="col-md-2">
 		<div id='location-facet-loading'><span class="label label-primary">@Messages.get("search.loading_locations")</span></div>
@@ -155,5 +155,5 @@ <h4>@Messages.get("search.location") @if(!location.isEmpty){
 	@defining(if(!q.isEmpty) q else "*") { qParam =>
 	<p>@Html(Messages.get("search.footer.api_text", routes.Application.search(q=qParam, from=from, format="json", location=location), 
 	routes.Application.search(q=qParam, from=from, format="csv", location=location), routes.Application.api()))</p>
-	}} else { @if(!q.isEmpty) {<p>@Html(Messages.get("search.footer.no_results", q))</p>} } }
+	}} else { @if(!q.isEmpty) {<p class='footer'>@Html(Messages.get("search.footer.no_results", q))</p>} } }
 }}

conf/application.conf

@@ -76,20 +76,6 @@ application.global=Global
 #
 # ebean.default="models.*"
 
-# Logger
-# ~~~~~
-# You can also configure logback (http://logback.qos.ch/),
-# by providing an application-logger.xml file in the conf directory.
-
-# Root logger:
-logger.root=ERROR
-
-# Logger used by the framework:
-logger.play=INFO
-
-# Logger provided to your application:
-logger.application=DEBUG
-
 organisation.icons={
   "http://purl.org/lobid/libtype#n34" : "music",
   "http://purl.org/lobid/libtype#n39" : "bus",

conf/logger.xml

@@ -0,0 +1,55 @@
+<!-- ~ Copyright (C) 2009-2015 Typesafe Inc. <http://www.typesafe.com> -->
+<!-- The default logback configuration that Play uses if no other configuration 
+	is provided -->
+<configuration>
+
+	<conversionRule conversionWord="coloredLevel" converterClass="play.api.Logger$ColoredLevel" />
+
+	<appender name="FILE"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>./logs/application.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- Weekly rollover with compression -->
+			<fileNamePattern>application-log-%d{yyyy-ww}.gz</fileNamePattern>
+			<!-- keep 8 weeks worth of history -->
+			<maxHistory>8</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date{yyyy-MM-dd HH:mm:ss ZZZZ} [%level] from %logger in
+				%thread - %message%n%xException</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%coloredLevel %logger{15} - %message%n%xException{10}
+			</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="ASYNCFILE" class="ch.qos.logback.classic.AsyncAppender">
+		<appender-ref ref="FILE" />
+	</appender>
+
+	<appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender">
+		<appender-ref ref="STDOUT" />
+	</appender>
+
+	<logger name="play" level="INFO" />
+	<logger name="application" level="INFO" />
+
+	<!-- Off these ones as they are annoying, and anyway we manage configuration 
+		ourself -->
+	<logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF" />
+	<logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader"
+		level="OFF" />
+	<logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread"
+		level="OFF" />
+	<logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF" />
+
+	<root level="WARN">
+		<appender-ref ref="ASYNCFILE" />
+		<appender-ref ref="ASYNCSTDOUT" />
+	</root>
+
+</configuration>

conf/messages.de

@@ -150,3 +150,5 @@ dataset.distribution.documentation = Dokumentation
 dataset.distribution.url = URL
 dataset.distribution.license = Lizenz
 dataset.distribution.media = Medientypen
+
+error = Fehler

conf/messages.en

@@ -150,3 +150,5 @@ dataset.distribution.documentation = Documentation
 dataset.distribution.url = URL
 dataset.distribution.license = License
 dataset.distribution.media = Media types
+
+error = Error