X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=installer%2Finstall.pl;h=41d04a73050bd6b73163c2511661ce75c9ff8c2c;hb=3c030be17271f8e10ea72465fe594b6151684124;hp=3f4ef7e5b78905a6dfedb993ca8a771c7a107341;hpb=e13dcb0e6f14040cfec1c65685f18155ff8cec72;p=koha_gimpoz diff --git a/installer/install.pl b/installer/install.pl index 3f4ef7e5b7..41d04a7305 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl -w # please develop with -w -#use diagnostics; +use diagnostics; # use Install; use InstallAuth; use C4::Context; use C4::Output; -use C4::Languages; +use C4::Languages qw(getAllLanguages getTranslatedLanguages); use strict; # please develop with the strict pragma @@ -40,7 +40,7 @@ $info{'dbms'} = ? C4::Context->config("db_scheme") : "mysql" ); $info{'hostname'} = C4::Context->config("hostname"); -$info{'port'} = C4::Context->config("port"); +$info{'port'} = C4::Context->config("port"); $info{'user'} = C4::Context->config("user"); $info{'password'} = C4::Context->config("pass"); my $dbh = DBI->connect( @@ -66,6 +66,9 @@ if ( $step && $step == 1 ) { unless ( eval { require ZOOM } ) { push @missing, { name => "ZOOM" }; } + unless ( eval { require YAML::Syck } ) { + push @missing, { name => "YAML::Syck" }; + } unless ( eval { require LWP::Simple } ) { push @missing, { name => "LWP::Simple" }; } @@ -87,10 +90,10 @@ if ( $step && $step == 1 ) { unless ( eval { require DBD::mysql } ) { push @missing, { name => "DBD::mysql" }; } - unless ( eval { require HTML::Template } ) { + unless ( eval { require HTML::Template::Pro } ) { push @missing, { name => "HTML::Template::Pro" }; } - unless ( eval { require HTML::Template } ) { + unless ( eval { require Date::Calc } ) { push @missing, { name => "Date::Calc" }; } unless ( eval { require Digest::MD5 } ) { @@ -140,7 +143,7 @@ if ( $step && $step == 1 ) { push @missing, { name => "PDF::Report", usagebarcode => 1 }; } } - unless ( eval { require Net::LDAP } ) { + unless ( eval { require Algorithm::CheckDigits } ) { if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal push @missing, { name => "Algorithm::CheckDigits", usagebarcode => 1 }; } @@ -188,7 +191,7 @@ elsif ( $step && $step == 2 ) { my $grantaccess; while ( my ($line) = $rq->fetchrow ) { my $dbname = $info{dbname}; - if ( $line =~ m/$dbname/ || index( $line, '*.*' ) > 0 ) { + if ( $line =~ m/^GRANT (.*?) ON `$dbname`\.\*/ || index( $line, '*.*' ) > 0 ) { $grantaccess = 1 if ( index( $line, 'ALL PRIVILEGES' ) > 0 @@ -270,7 +273,7 @@ elsif ( $step && $step == 3 ) { $finish->execute($kohaversion); } else { warn "INSERT Version"; - my $finish=$dbh->prepare("INSERT into systempreferences (variable,value,explanation) values ('Version',?,'The Koha database version. Don t change this value manually, it s holded by the webinstaller')"); + my $finish=$dbh->prepare("INSERT into systempreferences (variable,value,explanation) values ('Version',?,'The Koha database version. WARNING: Do not change this value manually, it is maintained by the webinstaller')"); $finish->execute($kohaversion); } @@ -280,9 +283,10 @@ 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' ) { - if ($query->param('Nozebra')) { + elsif ( $op && $op eq 'SetIndexingEngine' ) { + if ($query->param('NoZebra')) { $dbh->do("UPDATE systempreferences SET value=1 WHERE variable='NoZebra'"); + $dbh->do("UPDATE systempreferences SET value=0 WHERE variable in ('QueryFuzzy','QueryWeightFields','QueryStemming')"); } else { $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'"); } @@ -301,16 +305,15 @@ elsif ( $step && $step == 3 ) { my @fnames = sort { my @aa = split /\/|\\/, ($a); my @bb = split /\/|\\/, ($b); - $aa[-1] lt $bb[-1] + $aa[-1] cmp $bb[-1] } $query->param('framework'); - if ( $info{dbms} eq 'mysql' ) { $dbh->do('SET FOREIGN_KEY_CHECKS=0'); } - elsif ( $info{dbms} eq 'Pg' ) { $dbh->do('SET CONSTRAINTS ALL DEFERRED;'); } my $request = $dbh->prepare( "SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'" ); $request->execute; my ($systempreference) = $request->fetchrow; + $systempreference = '' unless defined $systempreference; # avoid warning foreach my $file (@fnames) { # warn $file; @@ -321,7 +324,7 @@ elsif ( $step && $step == 3 ) { . ( $info{hostname} ? " -h $info{hostname} " : "" ) . ( $info{port} ? " -P $info{port} " : "" ) . ( $info{user} ? " -u $info{user} " : "" ) - . ( $info{password} ? " -p$info{password}" : "" ) + . ( $info{password} ? " -p'$info{password}'" : "" ) . " $info{dbname} "; $error = qx($strcmd < $file 2>&1 1>/dev/null); # We want to send stdout to null and return only stderr... -fbcit } @@ -378,8 +381,6 @@ elsif ( $step && $step == 3 ) { "list" => \@list ); $template->param( "$op" => 1 ); - if ( $info{dbms} eq 'mysql' ) { $dbh->do('SET FOREIGN_KEY_CHECKS=1'); } - elsif ( $info{dbms} eq 'Pg' ) { $dbh->do('SET CONSTRAINTS ALL IMMEDIATE;'); } } elsif ( $op && $op eq 'selectframeworks' ) { # @@ -402,10 +403,14 @@ elsif ( $step && $step == 3 ) { my $langchoice = $query->param('fwklanguage'); $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); my $marcflavour = $query->param('marcflavour'); - if ($marcflavour){ + if ($marcflavour){ + # we can have some variants of marc flavour, by having different directories, like : unimarc_small and unimarc_full, for small and complete unimarc frameworks. + # marc_cleaned finds the marcflavour, without the variant. + my $marc_cleaned = 'MARC21'; + $marc_cleaned = 'UNIMARC' if $marcflavour =~ /unimarc/i; my $request = $dbh->prepare( - "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marcflavour','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');" + "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marc_cleaned','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');" ); $request->execute; }; @@ -415,7 +420,17 @@ elsif ( $step && $step == 3 ) { undef $/; my $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour/".lc($marcflavour); - opendir( MYDIR, $dir ) || warn "no open $dir"; + unless (opendir( MYDIR, $dir )) { + if ($langchoice eq 'en') { + warn "cannot open MARC frameworks directory $dir"; + } else { + # if no translated MARC framework is available, + # default to English + $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/en/marcflavour/".lc($marcflavour); + opendir(MYDIR, $dir) or warn "cannot open English MARC frameworks directory $dir"; + $template->param('en_marc_frameworks' => 1); + } + } my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); closedir MYDIR; @@ -426,6 +441,7 @@ elsif ( $step && $step == 3 ) { ); $request->execute; my ($frameworksloaded) = $request->fetchrow; + $frameworksloaded = '' unless defined $frameworksloaded; # avoid warning my %frameworksloaded; foreach ( split( /\|/, $frameworksloaded ) ) { $frameworksloaded{$_} = 1; @@ -441,7 +457,7 @@ elsif ( $step && $step == 3 ) { my @frameworklist; map { my $name = substr( $_, 0, -4 ); - open FILE, "< $dir/$requirelevel/$name.txt"; + open FILE, "<:utf8","$dir/$requirelevel/$name.txt"; my $lines = ; $lines =~ s/\n|\r/
/g; use utf8; @@ -461,7 +477,7 @@ elsif ( $step && $step == 3 ) { }; } @listname; my @fwks = - sort { $a->{'fwkname'} lt $b->{'fwkname'} } @frameworklist; + sort { $a->{'fwkname'} cmp $b->{'fwkname'} } @frameworklist; # $cell{"mandatory"}=($requirelevel=~/(mandatory|requi|oblig|necess)/i); $cell{"frameworks"} = \@fwks; @@ -474,7 +490,17 @@ elsif ( $step && $step == 3 ) { $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice"; - opendir( MYDIR, $dir ) || warn "no open $dir"; + unless (opendir( MYDIR, $dir )) { + if ($langchoice eq 'en') { + warn "cannot open sample data directory $dir"; + } else { + # if no sample data is available, + # default to English + $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/en"; + opendir(MYDIR, $dir) or warn "cannot open English sample data directory $dir"; + $template->param('en_sample_data' => 1); + } + } @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); closedir MYDIR; my @levellist; @@ -488,7 +514,7 @@ elsif ( $step && $step == 3 ) { my @frameworklist; map { my $name = substr( $_, 0, -4 ); - open FILE, "< $dir/$requirelevel/$name.txt"; + open FILE, "<:utf8","$dir/$requirelevel/$name.txt"; my $lines = ; $lines =~ s/\n|\r/
/g; use utf8; @@ -508,7 +534,7 @@ elsif ( $step && $step == 3 ) { }; } @listname; my @fwks = - sort { $a->{'fwkname'} lt $b->{'fwkname'} } @frameworklist; + sort { $a->{'fwkname'} cmp $b->{'fwkname'} } @frameworklist; # $cell{"mandatory"}=($requirelevel=~/(mandatory|requi|oblig|necess)/i); $cell{"frameworks"} = \@fwks; @@ -541,7 +567,16 @@ elsif ( $step && $step == 3 ) { $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); my $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour"; - opendir( MYDIR, $dir ) || warn "no open $dir"; + unless (opendir( MYDIR, $dir )) { + if ($langchoice eq 'en') { + warn "cannot open MARC frameworks directory $dir"; + } else { + # if no translated MARC framework is available, + # default to English + $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/en/marcflavour"; + opendir(MYDIR, $dir) or warn "cannot open English MARC frameworks directory $dir"; + } + } my @listdir = grep { !/^\./ && -d "$dir/$_" } readdir(MYDIR); closedir MYDIR; my $marcflavour=C4::Context->preference("marcflavour"); @@ -550,7 +585,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; } @@ -570,7 +605,7 @@ elsif ( $step && $step == 3 ) { . ( $info{hostname} ? " -h $info{hostname} " : "" ) . ( $info{port} ? " -P $info{port} " : "" ) . ( $info{user} ? " -u $info{user} " : "" ) - . ( $info{password} ? " -p$info{password}" : "" ) + . ( $info{password} ? " -p'$info{password}'" : "" ) . " $info{dbname} "; $error = qx($strcmd <$datadir/kohastructure.sql 2>&1 1>/dev/null); } @@ -596,7 +631,7 @@ elsif ( $step && $step == 3 ) { # #Do updatedatabase And report my $execstring = - C4::Context->config("intranetdir") . "/installer/updatedatabase.pl"; + C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl"; undef $/; my $string = qx($execstring 2>&1 1>/dev/null); # added '1>/dev/null' to return only stderr in $string. Needs testing here. -fbcit if ($string) { @@ -661,19 +696,8 @@ else { # LANGUAGE SELECTION page by default # using opendir + language Hash - - my $langavail = getTranslatedLanguages(); - - my @languages; - foreach (@$langavail) { - push @languages, - { - 'value' => $_->{'language_code'}, - 'description' => $_->{'language_name'} - } - if ( $_->{'language_code'} ); - } - $template->param( languages => \@languages ); + my $languages_loop = getTranslatedLanguages('intranet'); + $template->param( installer_languages_loop => $languages_loop ); if ($dbh) { my $rq = $dbh->prepare( @@ -682,6 +706,7 @@ else { my ($version) = $rq->fetchrow; if ($version) { $query->redirect("install.pl?step=3"); + exit; } } }