Closes #2433: Fix errors in advanced search with empty bbox filters a…

…nd back button (#2437) * Closes #2433: Fix errors in advanced search with empty bbox filters and back button
CeON · Mar 21, 2024 · cd80fb5 · cd80fb5
1 parent 9fc6671
commit cd80fb5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -31,6 +31,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.omnifaces.cdi.ViewScoped;
 
+import javax.annotation.PostConstruct;
 import javax.faces.model.SelectItem;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -100,6 +101,7 @@ public AdvancedSearchPage(DataverseDao dataverseDao, DatasetFieldServiceBean dat
 
     // -------------------- LOGIC --------------------
 
+    @PostConstruct
     public void init() {
         if (dataverseIdentifier != null) {
             dataverse = dataverseDao.findByAlias(dataverseIdentifier);

diff --git a/.../src/main/java/edu/harvard/iq/dataverse/search/advanced/field/GeoboxCoordSearchField.java b/.../src/main/java/edu/harvard/iq/dataverse/search/advanced/field/GeoboxCoordSearchField.java
@@ -45,6 +45,9 @@ public QueryPart getQueryPart() {
                 .filter(f -> StringUtils.isNotBlank(f.getSingleValue()))
                 .map(f -> f.getSingleValue() + f.getDatasetFieldType().getMetadata("geoboxCoord"))
                 .collect(Collectors.joining("|"));
+        if (coords.isEmpty()) {
+            return QueryPart.EMPTY;
+        }
         return new QueryPart(QueryPartType.FILTER, String.format("[GEO[%s|%s]]", parent.getDatasetFieldType().getName(), coords));
     }
 

diff --git a/dataverse-webapp/src/main/webapp/search/advanced.xhtml b/dataverse-webapp/src/main/webapp/search/advanced.xhtml
@@ -21,7 +21,6 @@
         <ui:define name="body">
             <f:metadata>
                 <o:importConstants type="edu.harvard.iq.dataverse.search.advanced.SearchFieldType" var="fieldTypeEnums"/>
-                <f:viewAction action="#{AdvancedSearchPage.init}"/>
                 <f:viewParam name="dataverseIdentifier" value="#{AdvancedSearchPage.dataverseIdentifier}"/>
                 <f:viewAction
                         action="#{dataverseHeaderFragment.initBreadcrumbs(AdvancedSearchPage.dataverse, bundle['dataverse.search.advancedSearch'])}"/>