Added habitat and collector to advanced search (configurable)

inbo · Jul 23, 2024 · cd5bbbd · cd5bbbd
1 parent 4d7af7d
commit cd5bbbd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/grails-app/i18n/messages_en.properties b/grails-app/i18n/messages_en.properties
@@ -89,6 +89,7 @@ advancedsearch.table10col01.title = Begin date
 advancedsearch.table10col01.des = (YYYY-MM-DD) leave blank for most recent record date
 advancedsearch.table10col02.title = End date
 advancedsearch.table10col02.des = (YYYY-MM-DD) leave blank for most recent record date
+advancedsearch.table11col01.title = Habitat
 advancedsearch.dataset.col.label = Data Resource
 advancedsearch.dataset.select.default = -- select a Data Resource --
 advancedsearch.button.submit = Search

diff --git a/grails-app/views/home/_advanced.gsp b/grails-app/views/home/_advanced.gsp
@@ -163,8 +163,8 @@
         </div>
     </g:if>
 
-    <g:if test="${request.getAttribute("collector_text") && request.getAttribute("collector_text").size() > 1}">
-        <div class="form-group">
+    <g:if test="${request.getAttribute('collector_text') || grailsApplication.config.getProperty('advancedSearchShowCollector', Boolean, false)}">
+       <div class="form-group">
             <label class="col-md-2 control-label" for="collector_text"><g:message code="advancedsearch.collector_text.title" default="Collector"/></label>
             <div class="col-md-6">
                 <input type="text" name="collector_text" id="collector_text" class="dataset form-control" placeholder="" value=""/>
@@ -221,6 +221,16 @@
         </div>
     </div>
 
+    <g:if test="grailsApplication.config.getProperty('advancedSearchShowHabitat', Boolean, false)}">
+        <div class="form-group">
+            <label class="col-md-2 control-label" for="habitat"><g:message code="advancedsearch.table11col01.title" default="Habitat"/></label>
+
+            <div class="col-md-6">
+                <input type="text" name="habitat" id="habitat" class="dataset form-control" placeholder="" value=""/>
+            </div>
+        </div>
+    </g:if>
+
     <input type="submit" value="<g:message code="advancedsearch.button.submit" default="Search"/>" class="btn btn-primary" />
     &nbsp;&nbsp;
     <input type="reset" value="<g:message code="advancedsearch.button.clear.all" default="Clear all"/>" id="clearAll" class="btn btn-default" onclick="$('input#solrQuery').val(''); $('input.clear_taxon').click(); return true;"/>

diff --git a/src/main/groovy/au/org/ala/biocache/hubs/AdvancedSearchParams.groovy b/src/main/groovy/au/org/ala/biocache/hubs/AdvancedSearchParams.groovy
@@ -73,6 +73,7 @@ class AdvancedSearchParams implements Validateable {
     String start_year = ""
     String end_year = ""
     String collector_text = ""
+    String habitat = ""
 
     private final String QUOTE = "\""
     private final String BOOL_OP = "AND"
@@ -110,6 +111,7 @@ class AdvancedSearchParams implements Validateable {
         if (duplicate_inst) queryItems.add("duplicate_inst:" + duplicate_inst)
         if (state_conservation) queryItems.add("state_conservation:" + state_conservation)
         if (collector_text) queryItems.add("collector_text:" + collector_text)
+        if (habitat) queryItems.add("habitat:" + habitat)
         //if (collectors_number) queryItems.add("collector:" + collectors_number); // TODO field in SOLR not active
 
         ArrayList<String> lsids = new ArrayList<String>()