Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into rpb-38-rppd
Browse files Browse the repository at this point in the history
  • Loading branch information
@fsteeg
fsteeg committed Dec 13, 2023
2 parents 4b11572 + 774fc83 commit 91dd437
Show file tree
Hide file tree
Showing 30 changed files with 241,314 additions and 239,895 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ RPB-Export_HBZ_SW.txt
RPB-Export_HBZ_Tit.txt
RPB-Export_HBZ_Tit_hbzIds.txt
RPB-Export_HBZ_Bio.txt
RPB-Export_HBZ_Ort.txt
RPB-Export_HBZ_Raum.txt
RPB-Export_HBZ_SWN.txt
RPB-Export_HBZ_Syst.txt
RPB-Export_HBZ_ZSS.txt
conf/RPBEXP/*.ZIP
nohup.out*
87 changes: 50 additions & 37 deletions app/controllers/nwbib/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ private static List<Pair<String, String>> cleanSortUnique(
* @param publisher Query for the resource publisher
* @param issued Query for the resource issued year
* @param medium Query for the resource medium
* @param nwbibspatial Query for the resource nwbibspatial classification
* @param nwbibsubject Query for the resource nwbibsubject classification
* @param rpbspatial Query for the resource rpbspatial classification
* @param rpbsubject Query for the resource rpbsubject classification
* @param from The page start (offset of page of resource to return)
* @param size The page size (size of page of resource to return)
* @param owner Owner filter for resource queries
Expand All @@ -238,7 +238,7 @@ private static List<Pair<String, String>> cleanSortUnique(
public static Promise<Result> search(final String q, final String person,
final String name, final String subject, final String id,
final String publisher, final String issued, final String medium,
final String nwbibspatial, final String nwbibsubject, final int from,
final String rpbspatial, final String rpbsubject, final int from,
final int size, final String owner, String t, String sort,
boolean details, String location, String word, String corporation,
String raw, String format) {
Expand All @@ -262,17 +262,30 @@ public static Promise<Result> search(final String q, final String person,
if (form.hasErrors())
return Promise.promise(
() -> badRequest(search.render(null, q, person, name, subject, id,
publisher, issued, medium, nwbibspatial, nwbibsubject, from, size,
publisher, issued, medium, rpbspatial, rpbsubject, from, size,
0L, owner, t, sort, location, word, corporation, raw)));
String query = form.data().get("q");
Promise<Result> result = okPromise(query != null ? query : q, person, name,
subject, id, publisher, issued, medium, nwbibspatial, nwbibsubject,
subject, id, publisher, issued, medium, rpbspatial, rpbsubject,
from, size, owner, t, sort, details, location, word, corporation, raw,
format.isEmpty() ? "html" : format);
cacheOnRedeem(cacheId, result, ONE_HOUR);
return result;
}

public static Promise<Result> searchSpatial(final String id, final int from, final int size,
final String format) {
return Promise.pure(found(routes.Application.search("", "", "", "", "", "", "", "",
"https://rpb.lobid.org/spatial#n" + id, "", from, size, "", "", "", false, "", "",
"", "", format)));
}

public static Promise<Result> showPl(String name, String db, int index, int zeilen, String s1) {
return Promise
.pure(ok("<head><meta http-equiv='Refresh' content='0; URL=https://rppd.lobid.org/"
+ s1 + "'/></head>").as("text/html"));
}

/**
* @param id The resource ID.
* @param format The requested resource format (html, json).
Expand Down Expand Up @@ -401,8 +414,8 @@ public static Result download(final String t) {
"attachment; filename=" + filename);
try {
return ok(new URL(CONFIG
.getString(t.equals("Raumsystematik") ? "index.data.nwbibspatial"
: "index.data.nwbibsubject")).openStream());
.getString(t.equals("Raumsystematik") ? "index.data.rpbspatial"
: "index.data.rpbsubject")).openStream());
} catch (IOException e) {
e.printStackTrace();
return internalServerError(e.getMessage());
Expand Down Expand Up @@ -476,18 +489,18 @@ private static Result classificationResult(String t, String placeholder) {
private static Promise<Result> okPromise(final String q, final String person,
final String name, final String subject, final String id,
final String publisher, final String issued, final String medium,
final String nwbibspatial, final String nwbibsubject, final int from,
final String rpbspatial, final String rpbsubject, final int from,
final int size, final String owner, String t, String sort,
boolean details, String location, String word, String corporation,
String raw, String format) {
final Promise<Result> result = call(q, person, name, subject, id, publisher,
issued, medium, nwbibspatial, nwbibsubject, from, size, owner, t, sort,
issued, medium, rpbspatial, rpbsubject, from, size, owner, t, sort,
details, location, word, corporation, raw, format);
return result.recover((Throwable throwable) -> {
Logger.error("Could not call Lobid", throwable);
flashError();
return internalServerError(search.render("[]", q, person, name, subject,
id, publisher, issued, medium, nwbibspatial, nwbibsubject, from, size,
id, publisher, issued, medium, rpbspatial, rpbsubject, from, size,
0L, owner, t, sort, location, word, corporation, raw));
});
}
Expand All @@ -511,12 +524,12 @@ private static void cacheOnRedeem(final String cacheId,
static Promise<Result> call(final String q, final String person,
final String name, final String subject, final String id,
final String publisher, final String issued, final String medium,
final String nwbibspatial, final String nwbibsubject, final int from,
final String rpbspatial, final String rpbsubject, final int from,
final int size, String owner, String t, String sort, boolean showDetails,
String location, String word, String corporation, String raw,
String format) {
final WSRequest requestHolder = Lobid.request(q, person, name, subject, id,
publisher, issued, medium, nwbibspatial, nwbibsubject, from, size,
publisher, issued, medium, rpbspatial, rpbsubject, from, size,
owner, t, sort, location, word, corporation, raw);
return requestHolder.get().map((WSResponse response) -> {
Long hits = 0L;
Expand Down Expand Up @@ -549,7 +562,7 @@ static Promise<Result> call(final String q, final String person,

return format.equals("html")
? ok(search.render(s, q, person, name, subject, id, publisher, issued,
medium, nwbibspatial, nwbibsubject, from, size, hits, owner, t,
medium, rpbspatial, rpbsubject, from, size, hits, owner, t,
sort, location, word, corporation, raw))
: ok(new ObjectMapper().writerWithDefaultPrettyPrinter()
.writeValueAsString(Json.parse(s)))
Expand All @@ -572,8 +585,8 @@ private static void uncache(List<String> ids) {
* @param publisher Query for the resource publisher
* @param issued Query for the resource issued year
* @param medium Query for the resource medium
* @param nwbibspatial Query for the resource nwbibspatial classification
* @param nwbibsubject Query for the resource nwbibsubject classification
* @param rpbspatial Query for the resource rpbspatial classification
* @param rpbsubject Query for the resource rpbsubject classification
* @param from The page start (offset of page of resource to return)
* @param size The page size (size of page of resource to return)
* @param owner Owner filter for resource queries
Expand All @@ -588,14 +601,14 @@ private static void uncache(List<String> ids) {
*/
public static Promise<Result> facets(String q, String person, String name,
String subject, String id, String publisher, String issued, String medium,
String nwbibspatial, String nwbibsubject, int from, int size,
String rpbspatial, String rpbsubject, int from, int size,
String owner, String t, String field, String sort, String location,
String word, String corporation, String raw) {

String key = String.format(
"facets.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s", field, q,
person, name, id, publisher, location, word, corporation, raw, subject,
issued, medium, nwbibspatial, nwbibsubject, owner, t);
issued, medium, rpbspatial, rpbsubject, owner, t);
Result cachedResult = (Result) Cache.get(key);
if (cachedResult != null) {
return Promise.promise(() -> cachedResult);
Expand Down Expand Up @@ -624,9 +637,9 @@ public static Promise<Result> facets(String q, String person, String name,
Comparator<Pair<JsonNode, String>> sorter = (p1, p2) -> {
String t1 = p1.getLeft().get("key").asText();
String t2 = p2.getLeft().get("key").asText();
boolean t1Current = current(subject, medium, nwbibspatial, nwbibsubject,
boolean t1Current = current(subject, medium, rpbspatial, rpbsubject,
owner, t, field, t1, raw);
boolean t2Current = current(subject, medium, nwbibspatial, nwbibsubject,
boolean t2Current = current(subject, medium, rpbspatial, rpbsubject,
owner, t, field, t2, raw);
if (t1Current == t2Current) {
if (!field.equals(ISSUED_FIELD)) {
Expand Down Expand Up @@ -655,12 +668,12 @@ public static Promise<Result> facets(String q, String person, String name,
: queryParam(t, term);
String ownerQuery = !field.equals(ITEM_FIELD) ? owner //
: withoutAndOperator(queryParam(owner, term));
String nwbibsubjectQuery =
!field.equals(RPB_SUBJECT_FIELD) ? nwbibsubject //
: queryParam(nwbibsubject, term);
String nwbibspatialQuery =
!field.equals(NWBIB_SPATIAL_FIELD) ? nwbibspatial //
: queryParam(nwbibspatial, term);
String rpbsubjectQuery =
!field.equals(RPB_SUBJECT_FIELD) ? rpbsubject //
: queryParam(rpbsubject, term);
String rpbspatialQuery =
!field.equals(NWBIB_SPATIAL_FIELD) ? rpbspatial //
: queryParam(rpbspatial, term);
String rawQuery = !field.equals(COVERAGE_FIELD) ? raw //
: rawQueryParam(raw, term);
String locationQuery = !field.equals(SUBJECT_LOCATION_FIELD) ? location //
Expand All @@ -670,12 +683,12 @@ public static Promise<Result> facets(String q, String person, String name,
String issuedQuery = !field.equals(ISSUED_FIELD) ? issued //
: queryParam(issued, term);

boolean current = current(subject, medium, nwbibspatial, nwbibsubject,
boolean current = current(subject, medium, rpbspatial, rpbsubject,
owner, t, field, term, raw);
String routeUrl = routes.Application.search(q, person, name, subjectQuery,
id, publisher, issuedQuery, mediumQuery, nwbibspatialQuery,
nwbibsubjectQuery, from, size, ownerQuery, typeQuery,
sort(sort, nwbibspatialQuery, nwbibsubjectQuery, subjectQuery), false,
id, publisher, issuedQuery, mediumQuery, rpbspatialQuery,
rpbsubjectQuery, from, size, ownerQuery, typeQuery,
sort(sort, rpbspatialQuery, rpbsubjectQuery, subjectQuery), false,
locationQuery, word, corporation, rawQuery, "").url();

String result = String.format(
Expand All @@ -690,7 +703,7 @@ public static Promise<Result> facets(String q, String person, String name,
};

Promise<Result> promise = Lobid.getFacets(q, person, name, subject, id,
publisher, issued, medium, nwbibspatial, nwbibsubject, owner, field, t,
publisher, issued, medium, rpbspatial, rpbsubject, owner, field, t,
location, word, corporation, raw).map(json -> {
Stream<JsonNode> stream = StreamSupport.stream(
Spliterators.spliteratorUnknownSize(json.findValue("aggregation")
Expand All @@ -705,7 +718,7 @@ public static Promise<Result> facets(String q, String person, String name,
String labelKey = String.format(
"facets-labels.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s.%s",
field, raw, q, person, name, id, publisher, word, corporation,
subject, issued, medium, nwbibspatial, nwbibsubject, raw,
subject, issued, medium, rpbspatial, rpbsubject, raw,
field.equals(ITEM_FIELD) ? "" : owner, t, location);

@SuppressWarnings("unchecked")
Expand All @@ -723,22 +736,22 @@ public static Promise<Result> facets(String q, String person, String name,
return promise;
}

private static String sort(String sort, String nwbibspatialQuery,
String nwbibsubjectQuery, String subjectQuery) {
return (nwbibspatialQuery + nwbibsubjectQuery + subjectQuery).contains(",")
private static String sort(String sort, String rpbspatialQuery,
String rpbsubjectQuery, String subjectQuery) {
return (rpbspatialQuery + rpbsubjectQuery + subjectQuery).contains(",")
? ""
/* relevance */ : sort;
}

private static boolean current(String subject, String medium,
String nwbibspatial, String nwbibsubject, String owner, String t,
String rpbspatial, String rpbsubject, String owner, String t,
String field, String term, String raw) {
return field.equals(MEDIUM_FIELD) && contains(medium, term)
|| field.equals(TYPE_FIELD) && contains(t, term)
|| field.equals(ITEM_FIELD) && contains(owner, term)
|| field.equals(NWBIB_SPATIAL_FIELD) && contains(nwbibspatial, term)
|| field.equals(NWBIB_SPATIAL_FIELD) && contains(rpbspatial, term)
|| field.equals(COVERAGE_FIELD) && rawContains(raw, quotedEscaped(term))
|| field.equals(RPB_SUBJECT_FIELD) && contains(nwbibsubject, term)
|| field.equals(RPB_SUBJECT_FIELD) && contains(rpbsubject, term)
|| field.equals(SUBJECT_FIELD) && contains(subject, term);
}

Expand Down
8 changes: 4 additions & 4 deletions app/controllers/nwbib/Classification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public Pair<List<JsonNode>, Map<String, List<JsonNode>>> buildHierarchy() {
} else
addAsSubClass(subClasses, hit, json, broader.findValue("@id").asText());
}
if (this == SPATIAL && (CONFIG.getBoolean("index.nwbibspatial.enrich")
if (this == SPATIAL && (CONFIG.getBoolean("index.rpbspatial.enrich")
|| Play.isTest())) { /* SpatialToSkos uses Play test server */
addFromCsv(subClasses);
}
Expand Down Expand Up @@ -479,8 +479,8 @@ public static void indexStartup() {
.actionGet();
if (!client.admin().indices().prepareExists(INDEX).execute().actionGet()
.isExists()) {
indexData(CONFIG.getString("index.data.nwbibsubject"), Type.NWBIB);
indexData(CONFIG.getString("index.data.nwbibspatial"), Type.SPATIAL);
indexData(CONFIG.getString("index.data.rpbsubject"), Type.NWBIB);
indexData(CONFIG.getString("index.data.rpbspatial"), Type.SPATIAL);
client.admin().indices().refresh(new RefreshRequest()).actionGet();
}
}
Expand Down Expand Up @@ -512,7 +512,7 @@ public static void indexShutdown() {
}

/**
* @param uri The nwbib or nwbibspatial URI
* @param uri The nwbib or rpbspatial URI
* @return The list of path segments to the given URI in its classification,
* e.g. for URI https://nwbib.de/subjects#N582060:
* [https://nwbib.de/subjects#N5, https://nwbib.de/subjects#N580000,
Expand Down
Loading

0 comments on commit 91dd437

Please sign in to comment.