Replace journals CSV with lobid-resources query (#611)

hbz · Jan 22, 2024 · f3711ab · f3711ab
1 parent a69b8e2
commit f3711ab
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 651 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,3 @@ conf/qid-query.csv
 conf/700n-import.jsonl
 conf/700n-import.zip
 conf/700n-import*.txt
-conf/nwbib-journals-new.csv
diff --git a/app/controllers/nwbib/Application.java b/app/controllers/nwbib/Application.java
@@ -4,7 +4,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -29,9 +28,7 @@
 import java.util.stream.StreamSupport;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.elasticsearch.common.base.Charsets;
 import org.elasticsearch.common.geo.GeoPoint;
-import org.elasticsearch.common.io.Streams;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -40,7 +37,6 @@
 
 import controllers.nwbib.Classification.Type;
 import play.Logger;
-import play.Play;
 import play.cache.Cache;
 import play.cache.Cached;
 import play.data.Form;
@@ -320,26 +316,49 @@ public static Result register(final String t) {
 
 	/**
 	 * @return A list of nwbib journals
-	 * @throws IOException If reading the journals list data fails
 	 */
 	@Cached(key = "journals", duration = ONE_DAY)
-	public static Result journals() throws IOException {
-		try (InputStream stream = Play.application().classloader()
-				.getResourceAsStream("nwbib-journals.csv")) {
-			String csv = new String(Streams.copyToByteArray(stream), Charsets.UTF_8);
-			List<String> lines = Arrays.asList(csv.split("\n"));
-			List<HashMap<String, String>> maps = lines.stream()
-					.filter(line -> line.split("\",\"").length == 2).map(line -> {
-						HashMap<String, String> map = new HashMap<>();
-						String[] strings = line.split("\",\"");
-						map.put("label", strings[0].replace("\"\"", "'").replace("\"", ""));
-						map.put("value", strings[1].replace("\"", ""));
-						return map;
-					}).collect(Collectors.toList());
-			String journals = Json.toJson(maps).toString();
-			return ok(browse_register.render(journals, "Zeitschriften",
-					"Zeitschriftenliste filtern"));
-		}
+	public static Promise<Result> journals() {
+		WSRequest requestHolder = WS.url(Application.CONFIG.getString("nwbib.api"))
+				.setHeader("Accept", "application/json")
+				.setQueryParameter("size", "1000")//
+				.setQueryParameter("filter",
+						"inCollection.id:\"https://nwbib.de/journals\"");
+		return requestHolder.get().map((WSResponse response) -> {
+			if (response.getStatus() == Http.Status.OK) {
+				final String label = "label";
+				List<Map<String, String>> journals = StreamSupport
+						.stream(Spliterators.spliteratorUnknownSize(
+								response.asJson().get("member").elements(), 0), false)
+						.map((JsonNode doc) -> {
+							HashMap<String, String> journal = new HashMap<>();
+							journal.put(label, journalLabelFor(doc));
+							journal.put("value", Lobid.shortId(doc.get("id").asText()));
+							return journal;
+						}).collect(Collectors.toList());
+				Collections.sort(journals, (map1, map2) -> {
+					return Collator.getInstance(Locale.GERMANY).compare(//
+							map1.get(label), map2.get(label));
+				});
+				return ok(browse_register.render(Json.toJson(journals).toString(),
+						"Zeitschriften", "Zeitschriftenliste filtern"));
+			}
+			Logger.warn("{}: {} ({}, {})", response.getStatus(),
+					response.getStatusText(), requestHolder.getUrl(),
+					requestHolder.getQueryParameters());
+			return internalServerError("Could not load journals");
+		});
+	}
+
+	private static String journalLabelFor(JsonNode doc) {
+		String other = "otherTitleInformation";
+		String responsibility = "responsibilityStatement";
+		String label = doc.get("title").asText();
+		if (doc.has(other))
+			label += ": " + doc.get(other).elements().next().asText();
+		if (doc.has(responsibility))
+			label += " / " + doc.get(responsibility).elements().next().asText();
+		return label;
 	}
 
 	/**

diff --git a/app/views/tags/browse_list.scala.html b/app/views/tags/browse_list.scala.html
@@ -89,7 +89,7 @@
                     case _ => value
                  }}">@hits</a>)
                  }
-                 <span @if(t!="Wikidata"){class='copy-link'}><a data-toggle="tooltip" data-placement="right" title="Identifikator und Bezeichnung in die Zwischenablage kopieren" href="#" onclick="copyToClipboard('@textToCopy', $(this));return false;"><span class="octicon octicon-clippy"></span></a></span>
+                 @if(t!="Zeitschriften"){<span @if(t!="Wikidata"){class='copy-link'}><a data-toggle="tooltip" data-placement="right" title="Identifikator und Bezeichnung in die Zwischenablage kopieren" href="#" onclick="copyToClipboard('@textToCopy', $(this));return false;"><span class="octicon octicon-clippy"></span></a></span>}
                 <div style="display: none">@normalized</div>
               }
               @if(t=="Wikidata"){