From bedab2e97317f1998181ef0c02d6c150fa07dc16 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 26 Dec 2007 17:07:11 -0600 Subject: [PATCH] web installer: clean up warns; improve naming of Nozebra op The former 'Nozebra' op has been renamed to 'SetIndexingEngine' to avoid having a 'Nozebra' op and a 'NoZebra' parameter distinguished only by case. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- installer/install.pl | 9 ++++----- .../intranet-tmpl/prog/en/modules/installer/step3.tmpl | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 640dac0ca5..f13f1e1612 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -280,14 +280,11 @@ 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 'Nozebra' ) { - warn "OP : $op"; + elsif ( $op && $op eq 'SetIndexingEngine' ) { if ($query->param('NoZebra')) { - warn "HERE"; $dbh->do("UPDATE systempreferences SET value=1 WHERE variable='NoZebra'"); $dbh->do("UPDATE systempreferences SET value=0 WHERE variable in ('QueryFuzzy','QueryWeightFields','QueryStemming')"); } else { - warn "WRONG"; $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'"); } $template->param( "$op" => 1 ); @@ -313,6 +310,7 @@ elsif ( $step && $step == 3 ) { ); $request->execute; my ($systempreference) = $request->fetchrow; + $systempreference = '' unless defined $systempreference; # avoid warning foreach my $file (@fnames) { # warn $file; @@ -430,6 +428,7 @@ elsif ( $step && $step == 3 ) { ); $request->execute; my ($frameworksloaded) = $request->fetchrow; + $frameworksloaded = '' unless defined $frameworksloaded; # avoid warning my %frameworksloaded; foreach ( split( /\|/, $frameworksloaded ) ) { $frameworksloaded{$_} = 1; @@ -554,7 +553,7 @@ elsif ( $step && $step == 3 ) { my %cell=( "label"=> ucfirst($marc), "code"=>uc($marc), - "checked"=>uc($marc) eq $marcflavour); + "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0); # $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||""; }; push @flavourlist, \%cell; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl index d9804bfb87..d3ed6ea280 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl @@ -172,7 +172,7 @@ -

Zebra or Nozebra ?

+

Choose indexing engine

Searching Koha's bibliographic and authorities databases can be acomplished in two ways: Koha can utilize a textual index engine (Zebra) or use its own internal indexing scheme (NoZebra).

@@ -199,14 +199,14 @@

Please Choose:

- +

Nozebra: my catalogue is not that large and I want something simple to setup/maintain

Zebra: I have a large catalogue, I understand I must configure Zebra after the installation has completed

- +

Installation complete.

Click on Finish to complete and load the Koha Staff Interface.

-- 2.39.5