Skip to content

Commit

Permalink
Merge branch 'rpb-224-citation' of https://github.com/hbz/rpb into main
Browse files Browse the repository at this point in the history
  • Loading branch information
fsteeg committed Nov 22, 2024
2 parents f6563a0 + 9703124 commit efb2411
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
13 changes: 7 additions & 6 deletions app/controllers/nwbib/Lobid.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static WSRequest request(final String q, final String person,

if (requestHolder.getQueryParameters().get("q") == null
&& requestHolder.getQueryParameters().get("word") == null) {
requestHolder.setQueryParameter("word", "*");
requestHolder.setQueryParameter("q", "*");
}
Logger.debug("Request URL {}, query params {} ", requestHolder.getUrl(),
requestHolder.getQueryParameters());
Expand All @@ -147,18 +147,19 @@ static WSRequest request(final String q, final String person,

private static WSRequest setupWordParameter(final String q,
final String rpbspatial, String word, WSRequest requestHolder) {
String searchParam = "q";
if (!q.trim().isEmpty() && rpbspatial.isEmpty())
return requestHolder.setQueryParameter("word", preprocess(q));
return requestHolder.setQueryParameter(searchParam, preprocess(q));
else if (!q.trim().isEmpty() && !rpbspatial.isEmpty())
return requestHolder.setQueryParameter("word",
return requestHolder.setQueryParameter(searchParam,
preprocess(q) + " AND " + setUprpbspatial(rpbspatial));
else if (!word.isEmpty() && rpbspatial.isEmpty())
return requestHolder.setQueryParameter("word", preprocess(word));
return requestHolder.setQueryParameter(searchParam, preprocess(word));
else if (!word.isEmpty() && !rpbspatial.trim().isEmpty()) {
return requestHolder.setQueryParameter("word",
return requestHolder.setQueryParameter(searchParam,
preprocess(word) + " AND " + setUprpbspatial(rpbspatial));
} else if (!rpbspatial.trim().isEmpty())
return requestHolder.setQueryParameter("word",
return requestHolder.setQueryParameter(searchParam,
setUprpbspatial(rpbspatial));
return requestHolder;
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/tags/result_doc.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
@withPrefixedLink("URN", "https://nbn-resolving.org/", doc \ "urn")
@result_field("Umfang", "extent", doc, TableRow.VALUES)
@result_field("Quelle", "bibliographicCitation", doc, TableRow.VALUES)
@result_field("In", "containedIn", doc, TableRow.LINKS)
@labelled("In", "containedIn")

@part_of("isPartOf", "hasSuperordinate")
@subordinateSearchFor(String.format("http://lobid.org/resources/%s#!", (doc \ "hbzId").asOpt[String].getOrElse("")))
Expand Down
21 changes: 19 additions & 2 deletions conf/rpb-titel-to-lobid.fix
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,24 @@ set_array("contribution[]")
call_macro("contributions", from: "person")
call_macro("contributions", from: "corporateBody")

move_field("bibliographicCitation[].*.value", "bibliographicCitation")
set_array("containedIn[]")
set_array("bibliographicCitation")

do list_as(citation: "bibliographicCitation[]")
copy_field("citation.value", "fullLabel")
if all_match("citation.value", "^http.*")
copy_field("citation.value", "containedIn[].$append.id")
copy_field("citation.label", "containedIn[].$last.label")
paste("fullLabel", "citation.label", "~ ",
"citation.volume", "~ (", "citation.year", "~) ",
"citation.issue", "~ ", "citation.alternativeNumbering",
"~ Seite ", "citation.pages", join_char: "")
replace_all("fullLabel", "\\(\\)", "") # empty year
end
move_field("fullLabel", "bibliographicCitation.$append")
end

uniq("containedIn[]")
join_field("bibliographicCitation", "; ")

# fulltextOnline and link to external description/ToC
Expand All @@ -345,6 +362,6 @@ end

move_field("edition", "edition[]")

retain( "type[]", "contribution[]", "edition[]", "extent", "hasItem[]", "responsibilityStatement[]", "language[]", "medium[]", "subject[]", "title", "hbzId", "oclcNumber[]", "otherTitleInformation[]", "natureOfContent[]", "publication[]", "sameAs[]", "describedBy", "@context", "id", "zdbId", "spatial[]", "inCollection[]", "rpbId", "schoeneNummer", "bibliographicCitation", "isPartOf[]", "note[]", "fulltextOnline[]", "description[]", "isbn[]")
retain( "type[]", "contribution[]", "edition[]", "extent", "hasItem[]", "responsibilityStatement[]", "language[]", "medium[]", "subject[]", "title", "hbzId", "oclcNumber[]", "otherTitleInformation[]", "natureOfContent[]", "publication[]", "sameAs[]", "describedBy", "@context", "id", "zdbId", "spatial[]", "inCollection[]", "rpbId", "schoeneNummer", "bibliographicCitation", "isPartOf[]", "note[]", "fulltextOnline[]", "description[]", "isbn[]", "containedIn[]")

vacuum()

0 comments on commit efb2411

Please sign in to comment.