Changeset 566 for trunk/grails-app/services

Timestamp:

Jun 3, 2010, 4:31:44 AM (15 years ago)

Author:

gav

Message:

Improvements to inventory text search, add inventoryGroup and hide Limit Search unless one of the values is true.

File:

• trunk/grails-app/services/InventoryItemSearchService.groovy (modified) (1 diff)

trunk/grails-app/services/InventoryItemSearchService.groovy

@@ -159 +159 @@
         // Build searchableParams.
         // Do not include params.sort, since not all properites are indexed.
-        def searchableParams = [max: params.max, offset: params.offset,
-                                                    reload: true, defaultOperator: 'or']
+        def searchableParams = [:]
+        searchableParams.max = params.max
+        searchableParams.offset = params.offset
+        searchableParams.reload = true
+        searchableParams.defaultOperator =  'or'
+        def properitesList = []
+        if(params.searchName)
+            properitesList << '$/InventoryItem/name'
+        if(params.searchDescription)
+            properitesList << '$/InventoryItem/description'
+        if(params.searchComment)
+            properitesList << '$/InventoryItem/comment'
+        if(params.searchLocation)
+            properitesList << '$/InventoryItem/inventoryLocation/name'
+        if(params.searchGroup)
+            properitesList << '$/InventoryItem/inventoryGroup/name'
+        if(params.searchSpareFor) {
+            properitesList << '$/InventoryItem/spareFor/name'
+            properitesList << '$/InventoryItem/spareFor/description'
+            properitesList << '$/InventoryItem/spareFor/comment'
+        }
+        if(properitesList)
+            searchableParams.properties = properitesList
+
+        // Require isActive and isObsolete.
+        def queryString = '( '+result.searchText+' )'+ ' AND isActive:"true" AND isObsolete:"false"'
 
         // Perform the searchable query.
         try {
-            result.inventoryItemList = InventoryItem.search(result.searchText, searchableParams)
+            result.inventoryItemList = InventoryItem.search(queryString, searchableParams)
+
+            // Would be nice if this worked.
+//             result.inventoryItemList = InventoryItem.search(result.searchText, searchableParams) {
+//                 must(term("isActive", true))
+//                 must(term("isObsolete", false))
+//             }
+
         } catch (e) {
             log.error e