Merge pull request #240 from charvolant/master

Fix for image search failing
AtlasOfLivingAustralia · Apr 8, 2019 · cde5322 · cde5322
2 parents 7dc648a + ceaf712
commit cde5322
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/grails-app/controllers/au/org/ala/bie/SearchController.groovy b/grails-app/controllers/au/org/ala/bie/SearchController.groovy
@@ -42,7 +42,9 @@ class SearchController {
      */
     // Documented in openapi.yml
     def imageSearch(){
-        render ([searchResults:searchService.imageSearch(regularise(params.id), params.start, params.rows, params.qc)] as JSON)
+        def start = params.start as Integer
+        def rows = params.rows as Integer
+        render ([searchResults:searchService.imageSearch(regularise(params.id), start, rows, params.qc)] as JSON)
     }
 
     /**

diff --git a/grails-app/services/au/org/ala/bie/SearchService.groovy b/grails-app/services/au/org/ala/bie/SearchService.groovy
@@ -44,7 +44,7 @@ class SearchService {
             if(!taxon){
                 return []
             }
-            def tid = Encoder.encodeQuery(taxon.guid)
+            def tid = Encoder.escapeSolr(taxon.guid)
             query = "(guid:\"${tid}\" OR rkid_${taxon.rank.toLowerCase().replaceAll('\\s', '_')}:\"${tid}\")"
         }