Commit 6ed25bd5 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.2-dev' into 'v4.x-master'

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

See merge request !31
parents 5b56387e 05016221
Pipeline #25638 passed with stages
in 7 minutes and 56 seconds
......@@ -22,3 +22,6 @@
[submodule "search-ui/src/main/webapp/themes/dariah-theme"]
path = search-ui/src/main/webapp/themes/dariah-theme
url = https://gitlab.rz.uni-bamberg.de/dariah/themes/dariah-theme.git
[submodule "search-ui/src/main/webapp/themes/dariah-repository-theme"]
path = search-ui/src/main/webapp/themes/dariah-repository-theme
url = https://gitlab.rz.uni-bamberg.de/dariah/themes/dariah-repository-theme
......@@ -9,7 +9,7 @@ allprojects {
apply plugin: 'eclipse'
group = 'eu.dariah.de.minfba'
version = '4.3.3-SNAPSHOT'
version = '4.3.4-SNAPSHOT'
repositories {
mavenLocal()
......
......@@ -41,7 +41,7 @@ public class SearchClientImpl extends BaseEsClientImpl implements SearchClient {
@Override
public long count(SearchParams params) {
if (params.getIndexNames()==null) {
if (params.getIndexNames()==null || params.getIndexNames().length==0) {
return 0;
}
......@@ -74,7 +74,7 @@ public class SearchClientImpl extends BaseEsClientImpl implements SearchClient {
@Override
public SearchResponse query(SearchParams params) {
try {
if (params.getIndexNames()==null) {
if (params.getIndexNames()==null || params.getIndexNames().length==0) {
return new NullSearchResponse();
}
......
......@@ -66,7 +66,7 @@ public class SearchServiceImpl implements SearchService {
@Override
public long count(QueryBuilder query, String... indexNames) {
if (indexNames==null || indexNames.length==0) {
indexNames= this.getIndexNames();
indexNames = this.getIndexNames();
}
return searchClient.count(new SearchParams(indexNames, query));
}
......
Subproject commit 576d22130e5ec4612227d3fef2cc21794cd4bf5f
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