Always add dissolution date to label

See #518
hbz · Jan 13, 2020 · 0c21488 · 0c21488
1 parent 7d2060e
commit 0c21488
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/controllers/nwbib/Classification.java b/app/controllers/nwbib/Classification.java
@@ -271,7 +271,7 @@ public static JsonNode ids(String q, String t) {
 	}
 
 	/**
-	 * @param uri The NWBib classificationURI
+	 * @param uri The NWBib classification URI
 	 * @param type The ES classification type (see {@link Classification.Type})
 	 * @return The label for the given URI
 	 */
@@ -336,6 +336,11 @@ public static Pair<List<JsonNode>, Map<String, List<JsonNode>>> buildHierarchyWi
 		json.elements().forEachRemaining(item -> {
 			String id = item.get("item").get("value").textValue();
 			String label = item.get("itemLabel").get("value").textValue();
+			String dissolution = item.has("dissolutionDate")
+					? item.get("dissolutionDate").get("value").textValue().split("-")[0]
+					: "";
+			label = !dissolution.isEmpty()
+					? label + String.format(" (bis %s)", dissolution) : label;
 			String topLevelLabelPrefix = "Regierungsbezirk";
 			String nwbibNamespaceId = toNwbibNamespace(id);
 			String gnd =
@@ -348,11 +353,6 @@ public static Pair<List<JsonNode>, Map<String, List<JsonNode>>> buildHierarchyWi
 			} else if (item.has("partOf")) {
 				String broaderId =
 						WIKIDATA + item.get("partOf").get("value").textValue();
-				String dissolution = item.has("dissolutionDate")
-						? item.get("dissolutionDate").get("value").textValue().split("-")[0]
-						: "";
-				label = !dissolution.isEmpty()
-						? label + String.format(" (bis %s)", dissolution) : label;
 				if (id.equals(NRW)) {
 					topClasses.add(Json.toJson(ImmutableMap.of("value", nwbibNamespaceId,
 							"label", "Sonstige", "notation", notation)));