Index: openacs-4/packages/search/tcl/search-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-init.tcl,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/search/tcl/search-init.tcl	7 Jun 2008 20:29:01 -0000	1.10
+++ openacs-4/packages/search/tcl/search-init.tcl	29 Jul 2009 22:21:38 -0000	1.10.2.1
@@ -1,5 +1,26 @@
+namespace eval search {}
+namespace eval search::init {}
+
 nsv_set search_static_variables item_counter 0
 
-ad_schedule_proc -thread t [parameter::get_from_package_key -package_key search -parameter SearchIndexerInterval -default 60 ] search::indexer
+ad_proc -private search::init::schedule_indexer {} {
 
+    Schedule the indexer if the search package has been instantiated (indexing doesn't work
+    if it hasn't been, so why should we schedule it?).
 
+    We use the uncached version of apm_package_id_from_key to avoid forcing the user to
+    restart their server after mounting search.
+
+} {
+    set package_id [apm_package_id_from_key_mem search]
+    if { $package_id != 0 } {
+        ad_schedule_proc \
+            -thread t [parameter::get \
+                          -package_id $package_id \
+                          -parameter SearchIndexerInterval \
+                          -default 60 ] \
+            search::indexer
+    }
+}
+
+search::init::schedule_indexer