X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=installer%2Finstall.pl;h=c9c13619765aba59c5388cf9c820762a636d51b2;hb=2cd3b00e902ef91bed0c4bec822f31ed9c16e992;hp=207e2b6b1e7969c1fd474d3f3ffc7edff7576e24;hpb=e64f395d4372aebc3422de5b2f57e3c8992e7e5f;p=koha.git diff --git a/installer/install.pl b/installer/install.pl index 207e2b6b1e..c9c1361976 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -1,18 +1,19 @@ -#!/usr/bin/perl -w # please develop with -w +#!/usr/bin/perl +use strict; +use warnings; use diagnostics; -# use Install; use InstallAuth; +use CGI; +use IPC::Cmd; + use C4::Context; use C4::Output; +use C4::Templates; use C4::Languages qw(getAllLanguages getTranslatedLanguages); use C4::Installer; -use strict; # please develop with the strict pragma - -use CGI; - my $query = new CGI; my $step = $query->param('step'); @@ -22,7 +23,7 @@ my ( $template, $loggedinuser, $cookie ); my $all_languages = getAllLanguages(); if ( defined($language) ) { - setlanguagecookie( $query, $language, "install.pl?step=1" ); + C4::Templates::setlanguagecookie( $query, $language, "install.pl?step=1" ); } ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -56,114 +57,35 @@ if ( $step && $step == 1 ) { #Checking ALL perl Modules and services needed are installed. #Whenever there is an error, adding a report to the page $template->param( language => 1 ); - my $problem; - - unless ( $] >= 5.006001 ) { # Bug 179 - $template->param( "problems" => 1, "perlversion" => 1 ); - $problem = 1; - } + $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are - # We could here use a special find - my @missing = (); - 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" }; - } - unless ( eval { require XML::Simple } ) { - push @missing, { name => "XML::Simple" }; - } - unless ( eval { require MARC::File::XML } ) { - push @missing, { name => "MARC::File::XML" }; - } - unless ( eval { require MARC::File::USMARC } ) { - push @missing, { name => "MARC::File::USMARC" }; - } - unless ( eval { require DBI } ) { - push @missing, { name => "DBI" }; - } - unless ( eval { require Date::Manip } ) { - push @missing, { name => "Date::Manip" }; - } - unless ( eval { require DBD::mysql } ) { - push @missing, { name => "DBD::mysql" }; - } - unless ( eval { require HTML::Template::Pro } ) { - push @missing, { name => "HTML::Template::Pro" }; - } - unless ( eval { require Date::Calc } ) { - push @missing, { name => "Date::Calc" }; - } - unless ( eval { require Digest::MD5 } ) { - push @missing, { name => "Digest::MD5" }; - } - unless ( eval { require MARC::Record } ) { - push @missing, { name => "MARC::Record" }; - } - unless ( eval { require Mail::Sendmail } ) { - push @missing, { name => "Mail::Sendmail", usagemail => 1 }; - } - unless ( eval { require List::MoreUtils } ) { - push @missing, { name => "List::MoreUtils" }; - } - unless ( eval { require XML::RSS } ) { - push @missing, { name => "XML::RSS" }; - } - unless ( eval { require CGI::Carp } ) { - push @missing, { name => "CGI::Carp" }; + unless ( $] >= 5.010000 ) { # Bug 7375 + $template->param( problems => 1, perlversion => 1, checkmodule => 0 ); } + my $perl_modules = C4::Installer::PerlModules->new; + $perl_modules->version_info; -# The following modules are not mandatory, depends on how the library want to use Koha - unless ( eval { require PDF::API2 } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "PDF::API2", usagebarcode => 1 }; - } - } - unless ( eval { require GD::Barcorde } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, - { name => "GD::Barcode", usagebarcode => 1, usagespine => 1 }; - } - } - unless ( eval { require Data::Random } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "Data::Random", usagebarcode => 1 }; - } - } - unless ( eval { require PDF::Reuse::Barcode } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "PDF::Reuse::Barcode", usagebarcode => 1 }; - } - } - unless ( eval { require PDF::Report } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "PDF::Report", usagebarcode => 1 }; - } - } - unless ( eval { require Algorithm::CheckDigits } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "Algorithm::CheckDigits", usagebarcode => 1 }; - } - } - unless ( eval { require GD::Barcode::UPCE } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "GD::Barcode::UPCE", usagepine => 1 }; - } - } - unless ( eval { require Net::LDAP } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "Net::LDAP", usageLDAP => 1 }; + my $modules = $perl_modules->get_attr('missing_pm'); + if (scalar(@$modules)) { + my @components = (); + my $checkmodule = 1; + foreach (@$modules) { + my ($module, $stats) = each %$_; + $checkmodule = 0 if $stats->{'required'}; + push( + @components, + { + name => $module, + version => $stats->{'min_ver'}, + require => $stats->{'required'}, + usage => $stats->{'usage'}, + } + ); } + @components = sort {$a->{'name'} cmp $b->{'name'}} @components; + $template->param( missing_modules => \@components, checkmodule => $checkmodule ); } - $template->param( missings => \@missing ) if ( scalar(@missing) > 0 ); - $template->param( 'checkmodule' => 1 ) - unless ( scalar(@missing) && $problem ); - } elsif ( $step && $step == 2 ) { # @@ -229,7 +151,7 @@ elsif ( $step && $step == 2 ) { } $template->param( "checkgrantaccess" => $grantaccess ); } # End mysql connect check... - + elsif ( $info{dbms} eq "Pg" ) { # Check if database has been created... my $rv = $dbh->do( "SELECT * FROM pg_catalog.pg_database WHERE datname = \'$info{dbname}\';" ); @@ -256,14 +178,14 @@ elsif ( $step && $step == 3 ) { # # STEP 3 : database setup # -# +# my $op = $query->param('op'); if ( $op && $op eq 'finished' ) { # # we have finished, just redirect to mainpage. # print $query->redirect("/cgi-bin/koha/mainpage.pl"); - exit 1; + exit; } elsif ( $op && $op eq 'finish' ) { $installer->set_version_syspref(); @@ -274,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 @@ -297,7 +215,7 @@ elsif ( $step && $step == 3 ) { # # # (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks) - + #Framework Selection #sql data for import are supposed to be located in installer/data// # Where is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.) @@ -310,19 +228,20 @@ elsif ( $step && $step == 3 ) { # Framework Selection is achieved through checking boxes. my $langchoice = $query->param('fwklanguage'); $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); + $langchoice =~ s/[^a-zA-Z_-]*//g; my $marcflavour = $query->param('marcflavour'); if ($marcflavour){ $installer->set_marcflavour_syspref($marcflavour); - }; + }; $marcflavour = C4::Context->preference('marcflavour') unless ($marcflavour); #Insert into database the selected marcflavour - undef $/; + undef $/; my ($marc_defaulted_to_en, $fwklist) = $installer->marc_framework_sql_list($langchoice, $marcflavour); $template->param('en_marc_frameworks' => $marc_defaulted_to_en); $template->param( "frameworksloop" => $fwklist ); $template->param( "marcflavour" => ucfirst($marcflavour)); - - my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice, $marcflavour); + + my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice); $template->param( "en_sample_data" => $sample_defaulted_to_en); $template->param( "levelloop" => $levellist ); $template->param( "$op" => 1 ); @@ -333,7 +252,7 @@ elsif ( $step && $step == 3 ) { # 1ST install, 2nd sub-step : show the user the marcflavour available. # # - + #Choose Marc Flavour #sql data are supposed to be located in installer/data///marcflavour/marcflavourname # Where is database type according to DBD syntax @@ -347,6 +266,7 @@ elsif ( $step && $step == 3 ) { # Marcflavour Selection is achieved through radiobuttons. my $langchoice = $query->param('fwklanguage'); $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); + $langchoice =~ s/[^a-zA-Z_-]*//g; my $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour"; unless (opendir( MYDIR, $dir )) { @@ -361,13 +281,13 @@ elsif ( $step && $step == 3 ) { } my @listdir = grep { !/^\./ && -d "$dir/$_" } readdir(MYDIR); closedir MYDIR; - my $marcflavour=C4::Context->preference("marcflavour"); + my $marcflavour=C4::Context->preference("marcflavour"); my @flavourlist; foreach my $marc (@listdir) { - my %cell=( + my %cell=( "label"=> ucfirst($marc), "code"=>uc($marc), - "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0); + "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0); # $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||""; }; push @flavourlist, \%cell; } @@ -391,21 +311,34 @@ elsif ( $step && $step == 3 ) { # Not 1st install, the only sub-step : update database # #Do updatedatabase And report - my $execstring = - 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) { - $string =~ s/\n|\r/
/g; - $string =~ - s/(DBD::mysql.*? failed: .*? line [0-9]*.|=================.*?====================)/$1<\/font>/g; - $template->param( "updatereport" => $string ); + + if ( ! defined $ENV{PERL5LIB} ) { + my $find = "C4/Context.pm"; + my $path = $INC{$find}; + $path =~ s/\Q$find\E//; + $ENV{PERL5LIB} = "$path:$path/installer"; + warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n"; + } + + my $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl"; + my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) = IPC::Cmd::run(command => $cmd, verbose => 0); + + if (@$stdout_buf) { + $template->param(update_report => [ map { { line => $_ } } split(/\n/, join('', @$stdout_buf)) ] ); + $template->param(has_update_succeeds => 1); } + if (@$stderr_buf) { + $template->param(update_errors => [ map { { line => $_ } } split(/\n/, join('', @$stderr_buf)) ] ); + $template->param(has_update_errors => 1); + warn "The following errors were returned while attempting to run the updatedatabase.pl script:\n"; + foreach my $line (@$stderr_buf) {warn "$line\n";} + } + $template->param( $op => 1 ); } else { # - # check wether it's a 1st install or an update + # check whether it's a 1st install or an update # #Check if there are enough tables. # Paul has cleaned up tables so reduced the count @@ -416,7 +349,7 @@ elsif ( $step && $step == 3 ) { $info{'user'}, $info{'password'} ); my $rq; - if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES FROM " . $info{'dbname'} ); } + if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES" ); } elsif ( $info{dbms} eq 'Pg' ) { $rq = $dbh->prepare( "SELECT * FROM information_schema.tables WHERE table_schema='public' and table_type='BASE TABLE';" ); } @@ -449,8 +382,6 @@ elsif ( $step && $step == 3 ) { ); } } - - $dbh->disconnect; } } else {