diff --git a/.gitmodules b/.gitmodules index 36915fc822503bec315206d4ab82a2abee5a052e..acbd52552d1fd2082d146c4d2176121f5f1b3628 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/build.gradle b/build.gradle index 60a618ceca3019de5119e5d8044c50ec8c4d13a2..5137434d71c90e499a7ee25a9732eef6f01bab30 100644 --- a/build.gradle +++ b/build.gradle @@ -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() diff --git a/search-core/src/main/java/eu/dariah/de/search/es/client/SearchClientImpl.java b/search-core/src/main/java/eu/dariah/de/search/es/client/SearchClientImpl.java index cc95e4908608eea11ae576f73c97ea549bf59428..2c21d6e963f3af7da33dfb5efbb3aff48e663085 100644 --- a/search-core/src/main/java/eu/dariah/de/search/es/client/SearchClientImpl.java +++ b/search-core/src/main/java/eu/dariah/de/search/es/client/SearchClientImpl.java @@ -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(); } diff --git a/search-core/src/main/java/eu/dariah/de/search/es/service/SearchServiceImpl.java b/search-core/src/main/java/eu/dariah/de/search/es/service/SearchServiceImpl.java index c84a7db9b2ef31636bae6a569c37f97dd1e3bb33..388198a22c6e3187aa20d79e891d6418f5943fb3 100644 --- a/search-core/src/main/java/eu/dariah/de/search/es/service/SearchServiceImpl.java +++ b/search-core/src/main/java/eu/dariah/de/search/es/service/SearchServiceImpl.java @@ -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)); } diff --git a/search-ui/src/main/webapp/themes/dariah-repository-theme b/search-ui/src/main/webapp/themes/dariah-repository-theme new file mode 160000 index 0000000000000000000000000000000000000000..576d22130e5ec4612227d3fef2cc21794cd4bf5f --- /dev/null +++ b/search-ui/src/main/webapp/themes/dariah-repository-theme @@ -0,0 +1 @@ +Subproject commit 576d22130e5ec4612227d3fef2cc21794cd4bf5f