Merge branch 'rpb-157-lifeDates' of https://github.com/hbz/lobid-gnd …

…into rppd

Resolves https://jira.hbz-nrw.de/browse/RPB-157

See:

https://rppd.lobid.org/118575260
https://rppd.lobid.org/118928872
https://rppd.lobid.org/118609947

app/models/AuthorityResource.java

@@ -466,7 +466,7 @@ private String process(String field, String value, String label, int i, int size
 		} else if (Arrays.asList("dateOfBirth", "dateOfDeath").contains(field)) {
 			result = germanDate(value);
 		}
-		else if (value.startsWith("http")) {
+		else if (value.startsWith("http") && !value.contains(" ")) {
 			List<String> facets = Arrays.asList(HomeController.AGGREGATIONS);
 			boolean labelBasedFacet = facets.contains(field + ".label");
 			boolean qBasedSearch = facets.stream().noneMatch(s -> s.startsWith(field));
@@ -511,6 +511,7 @@ private String labelFor(String uri) {
 					: response;
 			return entity.get("title").asText();
 		} catch (InterruptedException | ExecutionException e) {
+			Logger.error("Could not get label for {}", uri);
 			e.printStackTrace();
 		}
 		return uri;
@@ -522,7 +523,7 @@ public static String germanDate(String value) {
 					.from(DateTimeFormatter.ISO_LOCAL_DATE.parse(cleanDate(value)))
 					.format(DateTimeFormatter.ofPattern("dd.MM.uuuu", Locale.GERMAN));
 		} catch (DateTimeParseException e) {
-			e.printStackTrace();
+			Logger.warn("Non-ISO date: {}", value);
 			return value;
 		}
 
@@ -561,6 +562,7 @@ private static String year(JsonNode node) {
 			return "";
 		}
 		String text = node.elements().next().asText();
-		return text.matches("\\d{4}-\\d{2}-\\d{2}") ? text.split("-")[0] : text;
+		return text.matches(".*\\d{4}.*") ? text.replaceAll(".*(\\d{4}).*", "$1")
+				: text.replaceAll(".*(\\d{3}).*", "$1");
 	}
 }