bug 6227: remove search engine question from installer

NoZebra mode is deprecated.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/installer/install.pl b/installer/install.pl
index 5fac1f6..687d35e 100755 (executable)
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -188,6 +188,7 @@ elsif ( $step && $step == 3 ) {
     }
     elsif ( $op && $op eq 'finish' ) {
         $installer->set_version_syspref();
+        $installer->set_indexing_engine(0); # use Zebra
 
         # Installation is finished.
         # We just deny anybody access to install
@@ -195,10 +196,6 @@ elsif ( $step && $step == 3 ) {
         # The installer will have to relogin since we do not pass cookie to redirection.
         $template->param( "$op" => 1 );
     }
-    elsif ( $op && $op eq 'SetIndexingEngine' ) {
-        $installer->set_indexing_engine($query->param('NoZebra'));
-        $template->param( "$op" => 1 );
-    }
     elsif ( $op && $op eq 'addframeworks' ) {
     #
     # 1ST install, 3rd sub-step : insert the SQL files the user has selected

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index 208c7f9..9db885a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -180,41 +180,7 @@
     [% END %]
     </ul>
     [% END %]
-    <h2>Choose indexing engine</h2>
-    <p>Searching Koha's bibliographic and authorities databases can be accomplished in two ways:
-       Koha can utilize a textual index engine (Zebra) or use its own internal indexing scheme (NoZebra).
-       </p>
-    <p>You can change your selection after installation and re-index accordingly.</p>
-    <h3>Zebra</h3>
-      <ul>
-        <li>Is highly scalable (can scale to tens of millions of bibliographic records. Examples of
-               Zebra Koha installations include:
-               http://catalog.ccfls.org/cgi-bin/koha/opac-main.pl or 
-               http://www.mediathequeouestprovence.fr/)
-               </li>
-        <li>Native support for Z39.50 and SRU servers for bibliographic and authority data</li>
-               <li>Support for field-weighting, relevance ranking, truncation, stemming</li>
-               <li>Arbitrarily complex queries</li>
-        <li>Can be complex to configure and maintain</li>
-    </ul>
-    <h3>NoZebra (internal Koha indexes)</h3>
-        <ul>
-                       <li>Simple to configure and maintain</li>
-            <li>Hasn't been tested with data sets larger than 100,000 records</li>
-            <li>Does not provide a public (external) z3950 server</li>
-        </ul>
-    <p>Note that, if you choose "Zebra", you must configure Zebra before your catalog searching will work)</p>
-    <h3>Please Choose:</h3>
-        <form action="install.pl">
-            <input type="hidden" name="step" value="3" />
-            <input type="hidden" name="op" value="SetIndexingEngine" />
-            <p><input type="radio" name="NoZebra" value="1" />Nozebra: my catalog is not that large and I want something simple to setup/maintain</p>
-            <p><input type="radio" name="NoZebra" value="0" />Zebra: I have a large catalog, I understand I must configure Zebra after the installation has completed</p>
-            <input type="submit" value="Choose" /></form>
-        </form>
-[% END %]
-
-[% IF ( SetIndexingEngine ) %]
+    <h3>All done!</h3>
     <p>Installation complete.<br />
         <p>Click on Finish to complete and load the Koha Staff Interface.
         <form name="finish">