From d951e0ec04e43d3519ef78533d6ed906396c91fc Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Tue, 23 Oct 2012 09:53:24 -0300
Subject: [PATCH] Bug 8773 - Back to cronjob indexing as default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following Robin's comment I provide a follow up that restores
cronjob as default method for updating indexes.

The lines that control the koha-index-daemon are properly left
and comented out so the users that want to test this feature
have everything already set.

Sponsored-by: Universidad Nacional de Córdoba
---
 debian/koha-common.cron.d  |    3 ++-
 debian/koha-common.init    |   12 +++++++++---
 debian/scripts/koha-create |    4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/koha-common.cron.d b/debian/koha-common.cron.d
index c7fc94e..6b9e209 100644
--- a/debian/koha-common.cron.d
+++ b/debian/koha-common.cron.d
@@ -6,5 +6,6 @@
 SHELL=/bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-# */5 * * * * root test -x /usr/sbin/koha-rebuild-zebra && koha-rebuild-zebra $(koha-list --enabled)
+# Comment if you want to use the experimental koha-index-daemon integration
+*/5 * * * * root test -x /usr/sbin/koha-rebuild-zebra && koha-rebuild-zebra $(koha-list --enabled)
 */15 * * * * root koha-foreach --enabled --email /usr/share/koha/bin/cronjobs/process_message_queue.pl
diff --git a/debian/koha-common.init b/debian/koha-common.init
index 7946785..af9fdbb 100755
--- a/debian/koha-common.init
+++ b/debian/koha-common.init
@@ -45,7 +45,9 @@ do_start()
     # We insure all required directories exist, including disabled ones.
     koha-create-dirs $(koha-list)
     koha-start-zebra $(koha-list --enabled)
-    koha-start-indexer $(koha-list --enabled)
+    # Uncomment if you want to use the experimental koha-index-daemon integration
+    # (make sure you disabled the indexing cronjob on /etc/cron.d/koha-common)
+    # koha-start-indexer $(koha-list --enabled)
 }
 
 #
@@ -55,7 +57,9 @@ do_stop()
 {
     # We stop everything, including disabled ones.
     koha-stop-zebra $(koha-list) || true
-    koha-stop-indexer $(koha-list --enabled)
+    # Uncomment if you want to use the experimental koha-index-daemon integration
+    # (make sure you disabled the indexing cronjob on /etc/cron.d/koha-common)
+    # koha-stop-indexer $(koha-list --enabled)
 }
 
 #
@@ -63,7 +67,9 @@ do_stop()
 #
 do_reload() {
     koha-restart-zebra $(koha-list --enabled)
-    koha-restart-indexer $(koha-list --enabled)
+    # Uncomment if you want to use the experimental koha-index-daemon integration
+    # (make sure you disabled the indexing cronjob on /etc/cron.d/koha-common)
+    # koha-restart-indexer $(koha-list --enabled)
 }
 
 case "$1" in
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 5ec3349..844b22c 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -342,7 +342,9 @@ then
     koha-start-zebra "$name"
 
     # Start Indexer daemon
-    koha-start-indexer "$name"
+    # Uncomment if you want to use the experimental koha-index-daemon integration
+    # (make sure you disabled the indexing cronjob on /etc/cron.d/koha-common)
+    # koha-start-indexer "$name"
 fi
 
 
-- 
1.7.9.5