Changeset 622 for trunk/grails-app/services

Timestamp:

Jul 10, 2010, 10:48:50 PM (14 years ago)

Author:

gav

Message:

Apply bug fix for ticket #76.
Rename all instances of Lucene to Searchable.
Improved global directory config.
Add log levels for searchable plugin and compass.

Location:

trunk/grails-app/services

Files:

• CreateBulkDataService.groovy (modified) (5 diffs)
• CreateDataService.groovy (modified) (2 diffs)

trunk/grails-app/services/CreateBulkDataService.groovy

@@ -12 +12 @@
     def dateUtilService
     def appConfigService
+    def createDataService
     def searchableService
     def assignedGroupService
@@ -43 +44 @@
             return fail(code: 'default.not.development.environment.failure')
 
-        log.info "Stop mirroring lucene index."
-        searchableService.stopMirroring()
+        createDataService.stopSearchableIndex()
 
         log.info "Creating BULK data..."
@@ -83 +83 @@
         log.info "Creating BULK data...complete."
 
-        log.info "Start mirroring Lucene index."
-        searchableService.startMirroring()
-        log.info "Rebuilding Lucene index, bulkIndex."
-        searchableService.reindex()
-        log.info "Rebuilding Lucene index, complete."
+        createDataService.startSearchableIndex()
 
         return result
@@ -107 +103 @@
             return fail(code: 'default.not.development.environment.failure')
 
-        log.info "Stop mirroring Lucene index."
-        searchableService.stopMirroring()
+        createDataService.stopSearchableIndex()
 
         log.info "Creating BULK data..."
@@ -121 +116 @@
         log.info "Creating BULK data...complete."
 
-        log.info "Start mirroring Lucene index."
-        searchableService.startMirroring()
-        log.info "Rebuilding Lucene index, bulkIndex."
-        searchableService.reindex()
-        log.info "Rebuilding Lucene index, complete."
+        createDataService.startSearchableIndex()
 
         return result

trunk/grails-app/services/CreateDataService.groovy

@@ +1 @@
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
+
 /**
 * Provides a data service to create base and demo data.
@@ -1525 +1527 @@
 
     /**
-    * Lucene index and mirroring is disabled at startup.
-    * Us this to start Lucene indexing after creating bootstrap data.
+    * SearchableIndex and mirroring is disabled at startup.
+    * Use this to start indexing after creating bootstrap data.
     * @param indexInNewThread Whether to run the index in a new thread, defaults to true.
     */
-    def startLucene(Boolean indexInNewThread = true) {
-        log.info "Start mirroring Lucene index."
+    def startSearchableIndex(Boolean indexInNewThread = true) {
+        log.info "Start mirroring searchable index."
+        ConfigurationHolder.config.appSearchable.cascadeOnUpdate = true
         searchableService.startMirroring()
         if(indexInNewThread) {
             Thread.start {
-                log.info "Rebuilding Lucene index, bulkIndex (new thread)."
+                log.info "Rebuilding searchable index, bulkIndex (new thread)."
                 searchableService.index()
-                log.info "Rebuilding Lucene index, complete."
+                log.info "Rebuilding searchable index, complete."
             }
         }
         else {
-            log.info "Rebuilding Lucene index, bulkIndex."
+            log.info "Rebuilding searchable index, bulkIndex."
             searchableService.index()
-            log.info "Rebuilding Lucene index, complete."
+            log.info "Rebuilding searchable index, complete."
         }
     }
 
     /**
-    * Lucene index and mirroring during bulk data creation may be slow.
-    * Us this to stop lucene indexing and restart with startLucene() after data creation.
+    * Searchable index and mirroring during bulk data creation may be slow.
+    * Use this to stop indexing and restart with startSearchableIndex() after data creation.
     */
-    def stopLucene() {
-        log.info "Stop mirroring lucene index."
+    def stopSearchableIndex() {
+        log.info "Stop mirroring searchable index."
+        ConfigurationHolder.config.appSearchable.cascadeOnUpdate = false
         searchableService.stopMirroring()
     }