Skip to content
GitLab
Commit 1fcef5be authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.x-master' into 'v5.x-master' 

441: Fix issues related to deployment of upcoming v4-release (OPENED)

See merge request !42
parents 7c9555ef 9bae0fb1
Pipeline #26406 passed with stage
in 38 seconds
Hide whitespace changes
Inline Side-by-side
build.gradle
View file @ 1fcef5be
......@@ -9,7 +9,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'eu.dariah.de.minfba'
version = '4.3.9-SNAPSHOT'
version = '4.3.12-SNAPSHOT'
repositories {
mavenLocal()
......@@ -18,7 +18,7 @@ allprojects {
}
}
ext {
coreVersion = "6.5.3-SNAPSHOT"
coreVersion = "6.5.4-SNAPSHOT"
gtfVersion = "2.3.3-SNAPSHOT"
processingVersion = "4.3.4-SNAPSHOT"
colregModelVersion = "4.4.1-SNAPSHOT"
......
search-core/src/main/java/eu/dariah/de/search/controller/search/QueryExecutionController.java
View file @ 1fcef5be
......@@ -26,7 +26,6 @@ import eu.dariah.de.search.query.Query;
import eu.dariah.de.search.query.SimpleQuery;
import eu.dariah.de.search.query.SimpleQueryImpl;
import eu.dariah.de.search.query.execution.AggregationService;
import eu.dariah.de.search.query.execution.QueryExecutionServiceImpl;
import eu.dariah.de.search.query.results.QueryResult;
import eu.dariah.de.search.service.CustomSearchService;
import eu.dariah.de.search.service.DatamodelService;
......
search-core/src/main/java/eu/dariah/de/search/controller/search/base/BaseSearchController.java
View file @ 1fcef5be
......@@ -56,14 +56,14 @@ public abstract class BaseSearchController extends BaseController {
protected String getCollectionSelectionDialog(@RequestBody JsonNode body, List<Collection> availableCollections, Locale locale, Model model, HttpServletRequest request) {
ArrayNode sourceIdsNode = (ArrayNode) body.path("sourceIds");
List<String> sourceIds = new ArrayList<String>();
List<String> sourceIds = new ArrayList<>();
for (int i=0; i<sourceIdsNode.size(); i++) {
sourceIds.add(sourceIdsNode.get(i).textValue());
}
model.addAttribute("collections", collectionConverter.convert(availableCollections, locale));
model.addAttribute("preselectedCollIds", sourceIds);
model.addAttribute("preselectAll", sourceIds.size()==0);
model.addAttribute("preselectAll", sourceIds.isEmpty());
return "search/sourceSelectionForm";
}
......@@ -75,16 +75,15 @@ public abstract class BaseSearchController extends BaseController {
Map<String, String> collectionIdMap = collections.stream().collect(Collectors.toMap(Collection::getColregEntityId, Collection::getId));
for (int i=0; i<sourceIds.size(); i++) {
if (!collectionIdMap.containsKey(sourceIds.get(i))) {
if (!notifications.contains("~eu.dariah.de.minfba.search.view.notifications.selected_collection_unknown")) {
notifications.add("~eu.dariah.de.minfba.search.view.notifications.selected_collection_unknown");
}
continue;
}
if (strSourceId.length()>1) {
strSourceId.append(",");
}
strSourceId.append("\"").append(collectionIdMap.get(sourceIds.get(i))).append("\"");
if (collectionIdMap.containsKey(sourceIds.get(i))) {
strSourceId.append("\"").append(collectionIdMap.get(sourceIds.get(i))).append("\"");
} else {
strSourceId.append("\"").append("cid:" + sourceIds.get(i)).append("\"");
}
}
}
......
search-core/src/main/java/eu/dariah/de/search/query/execution/QueryExecutionServiceImpl.java
View file @ 1fcef5be
......@@ -7,6 +7,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.query.QueryBuilder;
......@@ -42,6 +44,7 @@ import eu.dariah.de.search.query.results.QueryResult;
import eu.dariah.de.search.query.results.QueryResultDatasource;
import eu.dariah.de.search.query.results.ResultElement;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.asm.Advice.This;
import eu.dariah.de.search.query.results.QueryResult.SearchTypes;
@Slf4j
......@@ -301,7 +304,7 @@ public class QueryExecutionServiceImpl extends BaseQueryService implements Query
if (responses==null) {
return;
}
Map<String, Long> datasourceCountMap = new HashMap<String, Long>();
Map<String, Long> datasourceCountMap = new HashMap<>();
for (SearchResponse resp : responses) {
if (resp==null || resp.getAggregations()==null) {
......@@ -328,9 +331,14 @@ public class QueryExecutionServiceImpl extends BaseQueryService implements Query
}
}
List<QueryResultDatasource> resultProviders = new ArrayList<QueryResultDatasource>();
List<String> unknownSourceIds = new ArrayList<>();
if (q.getSourceIds()!=null) {
unknownSourceIds.addAll(q.getSourceIds());
}
List<QueryResultDatasource> resultProviders = new ArrayList<>();
QueryResultDatasource qrd;
for (String datasourceId : datasourceCountMap.keySet()) {
for (String datasourceId : datasourceCountMap.keySet()) {
qrd = new QueryResultDatasource();
qrd.setHitCount(datasourceCountMap.get(datasourceId));
qrd.setLoadTags(qrd.getHitCount()>0);
......@@ -341,14 +349,37 @@ public class QueryExecutionServiceImpl extends BaseQueryService implements Query
qrd.setProviderName(collectionService.findById(datasourceId).getName("deu"));
}
resultProviders.add(qrd);
unknownSourceIds.remove(datasourceId);
}
// Resolve entries that were unknown before (still are in UI) and can be replaced with actual datasources now
Map<String, String> resolvedIdsMap = this.resolveUnknownExternalIds(unknownSourceIds);
for (Entry<String, String> resolvedIdsEntry : resolvedIdsMap.entrySet()) {
qrd = new QueryResultDatasource();
if (!resolvedIdsEntry.getKey().equals(resolvedIdsEntry.getValue())) {
qrd.setHitCount(datasourceCountMap.get(resolvedIdsEntry.getValue()));
qrd.setLoadTags(qrd.getHitCount()>0);
qrd.setProviderId(resolvedIdsEntry.getKey() + "~" + resolvedIdsEntry.getValue());
Collection ds = collectionService.findById(resolvedIdsEntry.getValue());
if (ds!=null) {
qrd.setProviderName(collectionService.findById(resolvedIdsEntry.getValue()).getName("deu"));
}
} else {
qrd.setHitCount(0);
qrd.setLoadTags(false);
qrd.setProviderName("unknown");
qrd.setProviderId(resolvedIdsEntry.getValue());
}
resultProviders.add(qrd);
}
Collections.sort(resultProviders);
qr.setResultDatasources(resultProviders);
}
private void addConfigInfo(Resource r, List<Element> elems) {
// This should never be the case! Why is it happening
if (elems==null) {
......@@ -375,3 +406,4 @@ public class QueryExecutionServiceImpl extends BaseQueryService implements Query
return false;
}
}
search-core/src/main/java/eu/dariah/de/search/query/execution/base/BaseQueryService.java
View file @ 1fcef5be
......@@ -17,6 +17,7 @@ import eu.dariah.de.search.Constants;
import eu.dariah.de.search.Constants.QueryTypes;
import eu.dariah.de.search.Constants.RootElementKeys;
import eu.dariah.de.search.es.service.SearchService;
import eu.dariah.de.search.model.Collection;
import eu.dariah.de.search.model.ExtendedMappingContainer;
import eu.dariah.de.search.query.ExtendedQuery;
import eu.dariah.de.search.query.Query;
......@@ -208,6 +209,24 @@ public abstract class BaseQueryService extends BaseResultService {
return this.wrapQueryBuilder(bqb, q);
}
protected Map<String, String> resolveUnknownExternalIds(List<String> sourceIds) {
Map<String, String> resolved = new HashMap<>(sourceIds.size());
Collection resolvedC;
for (String sourceId : sourceIds) {
if (sourceId.contains(":")) {
resolvedC = collectionService.findByColregEntityId(sourceId.substring(sourceId.indexOf(":")+1));
if (resolvedC!=null) {
resolved.put(sourceId, resolvedC.getId());
} else {
resolved.put(sourceId, sourceId);
}
} else {
resolved.put(sourceId, sourceId);
}
}
return resolved;
}
private QueryBuilder wrapQueryBuilder(QueryBuilder bldr, Query q) {
BoolQueryBuilder boolQb = null;
......@@ -227,7 +246,7 @@ public abstract class BaseQueryService extends BaseResultService {
}
if (q.getSourceIds()!=null && !q.getSourceIds().isEmpty()) {
boolQb.filter(QueryBuilders.termsQuery(Constants.ELEMENT_KEY_COLLECTION_ID, q.getSourceIds()));
boolQb.filter(QueryBuilders.termsQuery(Constants.ELEMENT_KEY_COLLECTION_ID, this.resolveUnknownExternalIds(q.getSourceIds()).values()));
}
}
......
search-ui/build.gradle
View file @ 1fcef5be
......@@ -37,6 +37,10 @@ dependencies {
testCompileOnly "org.projectlombok:lombok"
}
springBoot {
buildInfo()
}
bootWar {
launchScript()
}
......
search-ui/src/main/java/eu/dariah/de/search/config/WebConfig.java
View file @ 1fcef5be
......@@ -55,7 +55,7 @@ public class WebConfig implements WebMvcConfigurer {
@PostConstruct
public void completeConfiguration() {
if (localization.getBaseNames()==null) {
localization.setBaseNames("classpath:i18n/messages","/themes/" + theme + "/i18n/theme");
localization.setBaseNames("/themes/" + theme + "/i18n/theme", "classpath:i18n/messages");
}
}
......
i18n @ cab8358d
Compare 535db34a...cab8358d
Subproject commit 535db34aba0eca1c26739a6aff3524772b14a089
Subproject commit cab8358d7ef4525e5d79ce56a58b2ffc4e3aac8e
search-ui/src/main/webapp/WEB-INF/tags/topNav.tag
View file @ 1fcef5be
......@@ -40,8 +40,8 @@
<c:if test="${navSubSubItem.iconClass!=null && fn:length(navSubSubItem.iconClass)>0}">
<i class="${navSubSubItem.iconClass}"></i>&nbsp;
</c:if>
<c:if test="${navSubItem.displayCode!=null && fn:length(navSubItem.displayCode)>0}">
<s:message code="${navSubItem.displayCode}" />
<c:if test="${navSubSubItem.displayCode!=null && fn:length(navSubSubItem.displayCode)>0}">
<s:message code="${navSubSubItem.displayCode}" />
</c:if>
</a>
</c:if>
......
_search-commons @ 70bf0de9
Compare d3f821eb...70bf0de9
Subproject commit d3f821ebc77887ef7a77fdd87425204ff1ce2023
Subproject commit 70bf0de987331734a4d17199655e4f8658a5a25c
resources @ a761a623
Compare 32e1d5de...a761a623
Subproject commit 32e1d5ded7a30b738500748f2e07baeffb3019d3
Subproject commit a761a6234188333500aecf32bb0dabe946e2705c
clariah-theme @ e6a2eda5
Compare be962398...e6a2eda5
Subproject commit be962398b220fc7fc2bfc7fd62c610ff33153391
Subproject commit e6a2eda558cc14639c280e7675d56eeeef76fb25
dariah-repository-theme @ 0391bf65
Compare 90cbed2c...0391bf65
Subproject commit 90cbed2c64e2e6993daf2abeb92a56cdda27f3f2
Subproject commit 0391bf65650edc7fef658c5601d32508ce983c93
dariah-theme @ a0b12779
Compare 1feafba0...a0b12779
Subproject commit 1feafba0d8b4405dee29615c569d88f97c6ad723
Subproject commit a0b12779054b4a6f9128d7f49500f23b7211f0f5
mww-theme @ bffbb96d
Compare b0a4a681...bffbb96d
Subproject commit b0a4a681cbfab4cee147432ead86a9dd4c271076
Subproject commit bffbb96dde2114c810ead39f0f8a7f31a053f8e8
ohd-theme @ e0dc2ffb
Compare 81e735c1...e0dc2ffb
Subproject commit 81e735c155cd5f5cb10a1197c8884439ee7b8baf
Subproject commit e0dc2ffbf9ed8ab57e37652f9ae1c073338c90a4
tutorial-finder-theme @ a045dd9f
Compare 43b0b3e9...a045dd9f
Subproject commit 43b0b3e9e428a3a19ac50333e33cfd077389c27b
Subproject commit a045dd9f2ce65f5005d4975f3e76dca774f411d4
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment