Adding basic (non-geo) location search to ES search functionality.

rkimaoui · Aug 15, 2011 · 34b70f7 · 34b70f7
1 parent eb2fc2d
commit 34b70f7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/grails-app/controllers/org/cafeCentro/EventController.groovy b/grails-app/controllers/org/cafeCentro/EventController.groovy
@@ -31,7 +31,11 @@ class EventController {
     }
 
     private def performSearchUsingElasticSearch(q,location,offset, max) {
-        Map searchResults = Event.search(q.encodeAsElasticSearchQuery(),[offset:offset,max:max,sort:"date"])
+        def esQuery = q ? q.encodeAsElasticSearchQuery() : ""
+        def locationQueryString = location ? " venue.city:(${location.encodeAsElasticSearchQuery()})" : ""
+        esQuery += locationQueryString
+
+        Map searchResults = Event.search(esQuery,[offset:offset,max:max,sort:"date"])
 
         return [results:searchResults.searchResults, totalCount:searchResults.total]
     }