X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=installer%2Finstall.pl;h=9d2196207afe5349ee575a842497ec53356acba3;hb=a9015abe77c4807b218f9f65e97304f8eefe2f54;hp=7e9d61087d303e445d44200de5779f8433135e54;hpb=b9f141a592b15339fc36f07d6350c991defaf585;p=koha.git diff --git a/installer/install.pl b/installer/install.pl index 7e9d61087d..9d2196207a 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -1,26 +1,28 @@ -#!/usr/bin/perl -w # please develop with -w +#!/usr/bin/perl -#use diagnostics; +use strict; +use warnings; +use diagnostics; # use Install; use InstallAuth; use C4::Context; use C4::Output; -use C4::Languages; - -use strict; # please develop with the strict pragma +use C4::Languages qw(getAllLanguages getTranslatedLanguages); +use C4::Installer; use CGI; +use IPC::Cmd; -# -### Main Body #### -# my $query = new CGI; -my $step = $query->param('step') || 0; +my $step = $query->param('step'); + +my $language = $query->param('language'); +my ( $template, $loggedinuser, $cookie ); -my ($language, $template, $loggedinuser, $cookie); +my $all_languages = getAllLanguages(); -if ($language = $query->param('language')) { # assignment, not comparison +if ( defined($language) ) { setlanguagecookie( $query, $language, "install.pl?step=1" ); } ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -33,36 +35,27 @@ if ($language = $query->param('language')) { # assignment, not comparison } ); +my $installer = C4::Installer->new(); my %info; $info{'dbname'} = C4::Context->config("database"); -$info{'dbms' } = ( - C4::Context->config("db_scheme") +$info{'dbms'} = + ( C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") : "mysql" ); -foreach (qw(hostname user password)) { - $info{$_} = C4::Context->config($_); -} -($info{'hostname'}, $info{'port'}) = ($1,$2) - if $info{'hostname'} =~ /([^:]*):([0-9]+)/; +$info{'hostname'} = C4::Context->config("hostname"); +$info{'port'} = C4::Context->config("port"); +$info{'user'} = C4::Context->config("user"); +$info{'password'} = C4::Context->config("pass"); my $dbh = DBI->connect( - "DBI:$info{dbms}:$info{dbname}:$info{hostname}" - . ( $info{port} ? ":$info{port}" : "" ), + "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}" + . ( $info{port} ? ";port=$info{port}" : "" ), $info{'user'}, $info{'password'} ); - if ($step == 1) {&step_one ;} -elsif ($step == 2) {&step_two ;} -elsif ($step == 3) {&step_three;} -else {&step_else ;} - -output_html_with_http_headers $query, $cookie, $template->output; - -# -### Subroutines ### -# -sub step_one { - # Checking ALL perl Modules and services needed are installed. - # Whenever there is an error, add a report to the page +if ( $step && $step == 1 ) { + #First Step + #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; @@ -73,70 +66,116 @@ sub step_one { # We could here use a special find my @missing = (); - my @required = qw( - ZOOM - LWP::Simple - XML::Simple - MARC::File::XML - MARC::File::USMARC - DBI - Date::Manip - DBD::mysql - HTML::Template::Pro - Date::Calc - Digest::MD5 - MARC::Record - List::MoreUtils - XML::RSS - CGI::Carp - Mail::Sendmail - ); - my %optional = ( - 'PDF::API2' => 'usagebarcode', - 'PDF::Reuse::Barcode' => 'usagebarcode', - 'PDF::Report' => 'usagebarcode', - 'Data::Random' => 'usagebarcode', - 'Algorithm::CheckDigits' => 'usagebarcode', - 'GD::Barcode' => 'usagebarcode usagespine', - 'GD::Barcode::UPCE' => 'usagepine', - 'Net::LDAP' => 'usageLDAP', - 'Mail::Sendmail' => 'usagemail', - ); - push @missing, map {{name => $_}} grep {! eval {require $_}} @required; + 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" }; + } + # The following modules are not mandatory, depends on how the library want to use Koha - if ($#missing) { # only when $#missing (is >= 0), so this isn't fatal - foreach my $module (keys %optional) { - unless ( eval { require $module } ) { - my @usages = split /\s+/, $optional{$module}; - push @missing, { name => $module, map {$_ => 1} @usages }; - } - } - $template->param( missings => \@missing ); + unless ( eval { require PDF::API2 } ) { + if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal + push @missing, { name => "PDF::API2", usagebarcode => 1 }; + } } - $template->param( 'checkmodule' => 1 ) unless (scalar(@missing) && $problem); -} + 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 }; + } + } + $template->param( missings => \@missing ) if ( scalar(@missing) > 0 ); + $template->param( 'checkmodule' => 1 ) + unless ( scalar(@missing) && $problem ); -sub line_check ($) { - my $line = shift; - return 1 if ( - index( $line, 'ALL PRIVILEGES' ) > 0 - || ( ( index( $line, 'SELECT' ) > 0 ) - && ( index( $line, 'INSERT' ) > 0 ) - && ( index( $line, 'UPDATE' ) > 0 ) - && ( index( $line, 'DELETE' ) > 0 ) - && ( index( $line, 'CREATE' ) > 0 ) - && ( index( $line, 'DROP' ) > 0 ) ) - ); - return 0; } - -sub step_two { - # STEP 2 Check Database connection and access +elsif ( $step && $step == 2 ) { +# +#STEP 2 Check Database connection and access +# $template->param(%info); - my $checkmysql = $query->param("checkmysql"); - $template->param( 'mysqlconnection' => $checkmysql ); - if ($checkmysql and $dbh) { + my $checkdb = $query->param("checkdb"); + $template->param( 'dbconnection' => $checkdb ); + if ($checkdb) { + if ($dbh) { + # Can connect to the mysql $template->param( "checkdatabaseaccess" => 1 ); if ( $info{dbms} eq "mysql" ) { @@ -148,138 +187,111 @@ sub step_two { } #Check if user have all necessary grants on this database. - my $rq = $dbh->prepare( "SHOW GRANTS FOR \'$info{user}\'\@'$info{hostname}'"); + my $rq = + $dbh->prepare( + "SHOW GRANTS FOR \'$info{user}\'\@'$info{hostname}'"); $rq->execute; my $grantaccess; - my $dbname = $info{dbname}; while ( my ($line) = $rq->fetchrow ) { - if ( $line =~ /$dbname/ || index( $line, '*.*' ) > 0 ) { - line_check($line) and $grantaccess = 1; + my $dbname = $info{dbname}; + if ( $line =~ m/^GRANT (.*?) ON `$dbname`\.\*/ || index( $line, '*.*' ) > 0 ) { + $grantaccess = 1 + if ( + index( $line, 'ALL PRIVILEGES' ) > 0 + || ( ( index( $line, 'SELECT' ) > 0 ) + && ( index( $line, 'INSERT' ) > 0 ) + && ( index( $line, 'UPDATE' ) > 0 ) + && ( index( $line, 'DELETE' ) > 0 ) + && ( index( $line, 'CREATE' ) > 0 ) + && ( index( $line, 'DROP' ) > 0 ) ) + ); } } unless ($grantaccess) { - $rq = $dbh->prepare("SHOW GRANTS FOR \'$info{user}\'\@'\%'"); + $rq = + $dbh->prepare("SHOW GRANTS FOR \'$info{user}\'\@'\%'"); $rq->execute; while ( my ($line) = $rq->fetchrow ) { - if ( $line =~ /$dbname/ || index( $line, '*.*' ) > 0 ) { - line_check($line) and $grantaccess = 1; + my $dbname = $info{dbname}; + if ( $line =~ m/$dbname/ || index( $line, '*.*' ) > 0 ) + { + $grantaccess = 1 + if ( + index( $line, 'ALL PRIVILEGES' ) > 0 + || ( ( index( $line, 'SELECT' ) > 0 ) + && ( index( $line, 'INSERT' ) > 0 ) + && ( index( $line, 'UPDATE' ) > 0 ) + && ( index( $line, 'DELETE' ) > 0 ) + && ( index( $line, 'CREATE' ) > 0 ) + && ( index( $line, 'DROP' ) > 0 ) ) + ); } } } $template->param( "checkgrantaccess" => $grantaccess ); - } - } else { + } # 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}\';" ); + if ( $rv == 1 ) { + $template->param( 'checkdatabasecreated' => 1 ); + } + + # Check if user has all necessary grants on this database... + my $rq = $dbh->do( "SELECT u.usesuper + FROM pg_catalog.pg_user as u + WHERE u.usename = \'$info{user}\';" ); + if ( $rq == 1 ) { + $template->param( "checkgrantaccess" => 1 ); + } + } # End Pg connect check... + } + else { $template->param( "error" => DBI::err, "message" => DBI::errstr ); } + } } - -sub step_three { - # STEP 3 : database setup - my $op = $query->param('op') || ''; - if ($op eq 'finished') { # we have finished, just redirect to mainpage. +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; } - elsif ($op eq 'finish') { - my $kohaversion=C4::Context::KOHAVERSION; - # remove the 3 last . to have a Perl number - $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/; - my $finish; - if (C4::Context->preference('Version')) { - warn "UPDATE Version"; - $finish=$dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='Version'"); - } else { - warn "INSERT Version"; - $finish=$dbh->prepare("INSERT into systempreferences (variable,value,explanation) values ('Version',?,'The Koha database version. Do not change this value manually, it is written by the webinstaller')"); - } + elsif ( $op && $op eq 'finish' ) { + $installer->set_version_syspref(); - $finish->execute($kohaversion); # Installation is finished. - # We just deny anybody acess to install + # We just deny anybody access to install # And we redirect people to mainpage. - # The installer wil have to relogin since we do not pass cookie to redirection. + # The installer will have to relogin since we do not pass cookie to redirection. $template->param( "$op" => 1 ); } - elsif ($op eq 'Nozebra') { - if ($query->param($op)) { - $dbh->do("UPDATE systempreferences SET value=1 WHERE variable='$op'"); - } else { - $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='$op'"); - } + elsif ( $op && $op eq 'SetIndexingEngine' ) { + $installer->set_indexing_engine($query->param('NoZebra')); $template->param( "$op" => 1 ); } - elsif ($op eq 'addframeworks') { + elsif ( $op && $op eq 'addframeworks' ) { + # # 1ST install, 3rd sub-step : insert the SQL files the user has selected - #Framework importing and reports - my $lang; - my %hashlevel; - - # sort by filename -> prepend with numbers to specify order of insertion. - my @fnames = sort { - my @aa = split /\/|\\/, ($a); - my @bb = split /\/|\\/, ($b); - $aa[-1] lt $bb[-1] - } $query->param('framework'); - $dbh->do('SET FOREIGN_KEY_CHECKS=0'); - my $request = $dbh->prepare( - "SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'" - ); - $request->execute; - my ($systempreference) = $request->fetchrow; - foreach my $file (@fnames) { - # warn $file; - undef $/; - my $strcmd = "mysql " - . ( $info{hostname} ? " -h $info{hostname} " : "" ) - . ( $info{port} ? " -P $info{port} " : "" ) - . ( $info{user} ? " -u $info{user} " : "" ) - . ( $info{password} ? " -p$info{password}" : "" ) - . " $info{dbname} "; - my $error = qx($strcmd < $file 2>&1); - my @file = split qr(\/|\\), $file; # odd use of qr - my $fsize = scalar(@file); - $lang = $file[$fsize-3] unless ($lang); - my $level = $file[$fsize-2]; - unless ($error and index($systempreference, $file[$fsize-1]) >= 0) { - $systempreference .= "$file[$fsize-1]|" - } + # - #Bulding here a hierarchy to display files by level. - push @{ $hashlevel{$level} }, - { "fwkname" => $file[$fsize-1], "error" => $error }; - } - - #systempreference contains an ending | - chop $systempreference; - my @list; - map { push @list, { "level" => $_, "fwklist" => $hashlevel{$_} } } - keys %hashlevel; - my $fwk_language; - for my $each_language (getAllLanguages()) { - # warn "CODE".$each_language->{'language_code'}; - # warn "LANG:".$lang; - if ( $lang eq $each_language->{'language_code'} ) { - $fwk_language = $each_language->{language_locale_name}; - } - } - my $updateflag = - $dbh->do( - "UPDATE systempreferences set value=\"$systempreference\" where variable='FrameworksLoaded'" - ); - unless ( $updateflag == 1 ) { - my $string = - "INSERT INTO systempreferences (value, variable, explanation, type) VALUES (\"$systempreference\",'FrameworksLoaded','Frameworks loaded through webinstaller','choice')"; - my $rq = $dbh->prepare($string); - $rq->execute; - } + my ($fwk_language, $list) = $installer->load_sql_in_order($all_languages, $query->param('framework')); $template->param( "fwklanguage" => $fwk_language, - "list" => \@list + "list" => $list ); $template->param( "$op" => 1 ); - $dbh->do('SET FOREIGN_KEY_CHECKS=1'); } - elsif ($op eq 'selectframeworks') { + elsif ( $op && $op eq 'selectframeworks' ) { # # # 1ST install, 2nd sub-step : show the user the sql datas he can insert in the database. @@ -287,147 +299,130 @@ sub step_three { # # (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// + #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.) - # Where is a category of requirement : required, recommended, optional + # Where is a category of requirement : required, recommended optional # level should contain : # SQL File for import With a readable name. - # txt File taht explains what this SQL File is meant for. + # txt File that explains what this SQL File is meant for. # Could be VERY useful to have A Big file for a kind of library. # But could also be useful to have some Authorised values data set prepared here. # Framework Selection is achieved through checking boxes. - my $langchoice = $query->param('fwklanguage') || - $query->cookie('KohaOpacLanguage') ; - my $dir = C4::Context->config('intranetdir') . "/installer/data/"; - opendir( MYDIR, $dir ); - my @listdir = grep { !/^\.|CVS/ && -d "$dir/$_" } readdir(MYDIR); - closedir MYDIR; - my $frmwklangs = getFrameworkLanguages(); - my @languages; - map { # inappropriate use of map in void context - push @languages, - { - 'dirname' => $_->{'language_code'}, - 'languagedescription' => $_->{'language_name'}, - 'checked' => ( $_->{'language_code'} eq $langchoice ) - } - if ( $_->{'language_code'} ); - } @$frmwklangs; - $template->param( "languagelist" => \@languages ); - undef $/; - $dir = C4::Context->config('intranetdir') . "/installer/data/$langchoice"; - opendir ( MYDIR, $dir ) or warn "Cannot read directory $dir"; - @listdir = sort grep { !/^\.|CVS/ && -d "$dir/$_" } readdir(MYDIR); - closedir MYDIR; - my @levellist; - my $request = $dbh->prepare( - "SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'" - ); - $request->execute; - my ($frameworksloaded) = $request->fetchrow; - my %frameworksloaded; - - foreach ( split( /\|/, $frameworksloaded ) ) { - $frameworksloaded{$_} = 1; + my $langchoice = $query->param('fwklanguage'); + $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); + 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 $/; + 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); + $template->param( "en_sample_data" => $sample_defaulted_to_en); + $template->param( "levelloop" => $levellist ); + $template->param( "$op" => 1 ); + } + elsif ( $op && $op eq 'choosemarc' ) { + # + # + # 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 + # Where is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.) + # Where is a category of requirement : required, recommended optional + # level should contain : + # SQL File for import With a readable name. + # txt File taht explains what this SQL File is meant for. + # Could be VERY useful to have A Big file for a kind of library. + # But could also be useful to have some Authorised values data set prepared here. + # Marcflavour Selection is achieved through radiobuttons. + my $langchoice = $query->param('fwklanguage'); + $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); + my $dir = + C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour"; + 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"; + } } - foreach my $requirelevel (@listdir) { - $dir = - C4::Context->config('intranetdir') - . "/installer/data/$langchoice/$requirelevel"; - opendir( MYDIR, $dir ); - my @listname = - grep { !/^\.|CVS/ && -f "$dir/$_" && $_ =~ m/\.sql$/ } - readdir(MYDIR); - closedir MYDIR; - my %cell; - my @frameworklist; - map { # inappropriate use of map in void context - my $name = substr( $_, 0, -4 ); - open FILE, "< $dir/$name.txt"; - my $lines = ; - $lines =~ s/\n|\r/
/g; - use utf8; # this doesn't even make sense here. - utf8::encode($lines) unless ( utf8::is_utf8($lines) ); - push @frameworklist, - { - 'fwkname' => $name, - 'fwkfile' => "$dir/$_", - 'fwkdescription' => $lines, - 'checked' => ( - ( - $frameworksloaded{$_} - || ( $requirelevel =~ - /(mandatory|requi|oblig|necess)/i ) - ) ? 1 : 0 - ) - }; - } @listname; - my @fwks = - sort { $a->{'fwkname'} lt $b->{'fwkname'} } @frameworklist; - - # $cell{"mandatory"}=($requirelevel=~/(mandatory|requi|oblig|necess)/i); - $cell{"frameworks"} = \@fwks; - $cell{"label"} = ucfirst($requirelevel); - $cell{"code"} = lc($requirelevel); - push @levellist, \%cell; + my @listdir = grep { !/^\./ && -d "$dir/$_" } readdir(MYDIR); + closedir MYDIR; + my $marcflavour=C4::Context->preference("marcflavour"); + my @flavourlist; + foreach my $marc (@listdir) { + my %cell=( + "label"=> ucfirst($marc), + "code"=>uc($marc), + "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0); +# $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||""; }; + push @flavourlist, \%cell; } - $template->param( "levelloop" => \@levellist ); + $template->param( "flavourloop" => \@flavourlist ); $template->param( "$op" => 1 ); } - elsif ($op eq 'importdatastructure' ) { + elsif ( $op && $op eq 'importdatastructure' ) { # # # 1st install, 1st "sub-step" : import kohastructure # # - my $dbh = DBI->connect( - "DBI:$info{dbms}:$info{dbname}:$info{hostname}" - . ( $info{port} ? ":$info{port}" : "" ), - $info{'user'}, $info{'password'} - ); - open( INPUT, " }; - my @commands = split( /;/, $file ); - pop @commands; - map { $dbh->do($_) } @commands; - close(INPUT); + my $error = $installer->load_db_schema(); $template->param( - "error" => $dbh->errstr, + "error" => $error, "$op" => 1, ); - $dbh->disconnect; } - elsif ($op eq 'updatestructure' ) { + elsif ( $op && $op eq 'updatestructure' ) { # # Not 1st install, the only sub-step : update database # #Do updatedatabase And report - my $execstring = - C4::Context->config("intranetdir") . "/updater/updatedatabase"; - undef $/; - my $string = qx|$execstring 2>&1|; - if ($string) { - $string =~ s/\n|\r/
/g; - $string =~ - s/(DBD::mysql.*? failed: .*? line [0-9]*.|=================.*?====================)/$1<\/font>/g; - $template->param( "updatereport" => $string ); + 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); } + $template->param( $op => 1 ); } else { # - # Check wether it's a 1st install or an update + # check wether it's a 1st install or an update # - # Check if there are enough tables. + #Check if there are enough tables. # Paul has cleaned up tables so reduced the count #I put it there because it implied a data import if condition was not satisfied. my $dbh = DBI->connect( - "DBI:$info{dbms}:$info{dbname}:$info{hostname}" - . ( $info{port} ? ":$info{port}" : "" ), - $info{'user'}, $info{'password'} + "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}" + . ( $info{port} ? ";port=$info{port}" : "" ), + $info{'user'}, $info{'password'} ); - my $rq = $dbh->prepare( "SHOW TABLES FROM " . $info{'dbname'} ); + my $rq; + if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES FROM " . $info{'dbname'} ); } + elsif ( $info{dbms} eq 'Pg' ) { $rq = $dbh->prepare( "SELECT * + FROM information_schema.tables + WHERE table_schema='public' and table_type='BASE TABLE';" ); } $rq->execute; my $data = $rq->fetchall_arrayref( {} ); my $count = scalar(@$data); @@ -436,7 +431,9 @@ sub step_three { # if ( $count < 70 ) { $template->param( "count" => $count, "proposeimport" => 1 ); - } else { + } + else { + # # we have tables, propose to select files to upload or updatedatabase # $template->param( "count" => $count, "default" => 1 ); @@ -445,40 +442,37 @@ sub step_three { # if there is, then we just need to upgrade # if there is none, then we need to install the database # - if (my $dbversion = C4::Context->preference('Version')) { - $dbversion =~ s/(.*)\.(..)(..)(...)/$1.$2.$3.$4/; - $template->param( "upgrading" => 1, - "dbversion" => $dbversion, + if (C4::Context->preference('Version')) { + my $dbversion = C4::Context->preference('Version'); + $dbversion =~ /(.*)\.(..)(..)(...)/; + $dbversion = "$1.$2.$3.$4"; + $template->param("upgrading" => 1, + "dbversion" => $dbversion, "kohaversion" => C4::Context->KOHAVERSION, ); } } + $dbh->disconnect; } } +else { -sub step_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("SELECT * from systempreferences WHERE variable='Version'"); - if ( $rq->execute && $rq->fetchrow) { - $query->redirect("install.pl?step=3"); + $dbh->prepare( + "SELECT * from systempreferences WHERE variable='Version'"); + if ( $rq->execute ) { + my ($version) = $rq->fetchrow; + if ($version) { + $query->redirect("install.pl?step=3"); + exit; + } } } } - - - +output_html_with_http_headers $query, $cookie, $template->output;