-#!/usr/bin/perl -w # please develop with -w
+#!/usr/bin/perl
-#use diagnostics;
+use strict;
+use warnings;
+use diagnostics;
-# use Install;
use InstallAuth;
+use CGI;
+use IPC::Cmd;
+
use C4::Context;
use C4::Output;
-use C4::Languages;
-
-use strict; # please develop with the strict pragma
-
-use CGI;
+use C4::Languages qw(getAllLanguages getTranslatedLanguages);
+use C4::Installer;
my $query = new CGI;
my $step = $query->param('step');
}
);
+my $installer = C4::Installer->new();
my %info;
$info{'dbname'} = C4::Context->config("database");
$info{'dbms'} =
? C4::Context->config("db_scheme")
: "mysql" );
$info{'hostname'} = C4::Context->config("hostname");
-( $info{'hostname'}, $info{'port'} ) = ( $1, $2 )
- if $info{'hostname'} =~ /([^:]*):([0-9]+)/;
+$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'}
);
#First Step
#Checking ALL perl Modules and services needed are installed.
#Whenever there is an error, adding a report to the page
- # I suppose here that Apache user can access /usr/bin/
- # If mysql or zebra are in some fancy directory not in PATH
- # Performing a disk search.
$template->param( language => 1 );
- my $problem;
+ $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
unless ( $] >= 5.006001 ) { # Bug 179
- $template->param( "problems" => 1, "perlversion" => 1 );
- $problem = 1;
- }
- unless ( -x "/usr/bin/perl" ) {
- my $realperl = `which perl`;
- $realperl = `find / -name perl` unless ($realperl);
- chomp $realperl;
- $template->param( "problems" => 1, 'perllocation' => 1 )
- unless ($realperl);
- $problem = 1 unless ($realperl);
- }
- unless ( -x "/usr/local/bin/mysql" ) {
- my $mysql = `which mysql`;
- $mysql = `find / -name mysql` unless ($mysql);
- chomp $mysql;
- $template->param( "problems" => 1, 'mysql' => 1 ) unless ($mysql);
- $problem = 1 unless ($mysql);
- }
- unless ( -x "/usr/local/bin/zebraidx" || -x "/usr/local/bin/zebraidx-2.0" )
- {
- my $zebra = `which zebraidx`;
- $zebra = `which zebraidx-2.0` unless ($zebra);
- $zebra = `find / -name "zebraidx*"` unless ($zebra);
- chomp $zebra;
- $template->param( "problems" => 1, 'zebra' => 1 ) unless ($zebra);
- $problem = 1 unless ($zebra);
- }
- unless ( -x "/usr/local/bin/zebrasrv" || -x "/usr/local/bin/zebrasrv-2.0" )
- {
- my $zebra = `which zebrasrv`;
- $zebra = `which zebrasrv-2.0` unless ($zebra);
- $zebra = `find / -name "zebrasrv*"` unless ($zebra);
- chomp $zebra;
- $template->param( "problems" => 1, 'zebra' => 1 ) unless ($zebra);
- $problem = 1 unless ($zebra);
- }
- unless ( -x "/usr/local/bin/yaz-client" ) {
- my $yaz = `which yaz-client`;
- $yaz = `find / -name "yaz-client*"` unless ($yaz);
- chomp $yaz;
- $template->param( "problems" => 1, 'yaz' => 1 ) unless ($yaz);
- $problem = 1 unless ($yaz);
- }
-
- # We could here use a special find
- my @missing = ();
- unless ( eval { require ZOOM } ) {
- push @missing, { name => "ZOOM" };
- }
- 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 } ) {
- push @missing, { name => "HTML::Template::Pro" };
- }
- unless ( eval { require HTML::Template } ) {
- 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" };
- }
-
-# 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 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( problems => 1, perlversion => 1, checkmodule => 0 );
+ }
+
+ my $perl_modules = C4::Installer::PerlModules->new;
+ $perl_modules->version_info;
+
+ 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 ) {
#
-#STEP 2 Check Database conn~ection and access
+#STEP 2 Check Database connection and access
#
$template->param(%info);
- my $checkmysql = $query->param("checkmysql");
- $template->param( 'mysqlconnection' => $checkmysql );
- if ($checkmysql) {
+ my $checkdb = $query->param("checkdb");
+ $template->param( 'dbconnection' => $checkdb );
+ if ($checkdb) {
if ($dbh) {
# Can connect to the mysql
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
}
}
$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}\';" );
+ 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 );
#
# STEP 3 : database setup
#
-#
+#
my $op = $query->param('op');
- if ( $op && $op eq 'finish' ) {
- my $kohaversion=C4::Context::KOHAVERSION;
- # remove the 3 last . to have a Perl number
- $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
- if (C4::Context->preference('Version')) {
- warn "UPDATE Version";
- my $finish=$dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='Version'");
- $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')");
- $finish->execute($kohaversion);
+ if ( $op && $op eq 'finished' ) {
+ #
+ # we have finished, just redirect to mainpage.
+ #
+ print $query->redirect("/cgi-bin/koha/mainpage.pl");
+ exit 1;
}
+ elsif ( $op && $op eq 'finish' ) {
+ $installer->set_version_syspref();
- # Installation is finished.
- # We just deny anybody acess to install
- # And we redirect people to mainpage.
- # The installer wil have to relogin since we donot pass cookie to redirection.
+ # Installation is finished.
+ # We just deny anybody access to install
+ # And we redirect people to mainpage.
+ # The installer will have to relogin since we do not pass cookie to redirection.
$template->param( "$op" => 1 );
}
- elsif ( $op && $op eq 'finished' ) {
- #
- #
- # we have finished, just redirect to mainpage.
- #
- #
- print $query->redirect("/cgi-bin/koha/mainpage.pl");
- exit 1;
+ elsif ( $op && $op eq 'SetIndexingEngine' ) {
+ $installer->set_indexing_engine($query->param('NoZebra'));
+ $template->param( "$op" => 1 );
}
elsif ( $op && $op eq 'addframeworks' ) {
#
- # 1ST install : insert the SQL files the user has selected
+ # 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;
- $lang = $file[ scalar(@file) - 3 ] unless ($lang);
- my $level = $file[ scalar(@file) - 2 ];
- unless ($error) {
- $systempreference .= "$file[scalar(@file)-1]|"
- unless (
- index( $systempreference, $file[ scalar(@file) - 1 ] ) >=
- 0 );
- }
-
- #Bulding here a hierarchy to display files by level.
- push @{ $hashlevel{$level} },
- { "fwkname" => $file[ scalar(@file) - 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 (@$all_languages) {
-
- # 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 && $op eq 'selectframeworks' ) {
-#
-#
-# 1ST install : show the user the sql datas he can insert in the database.
-#
-#
-# (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 misc/sql-datas/<language>/<level>
-# Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
-# Where <level> 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.
-# Framework Selection is achieved through checking boxes.
+ #
+ #
+ # 1ST install, 2nd sub-step : show the user the sql datas he can insert in the database.
+ #
+ #
+ # (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/<language>/<level>
+ # Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
+ # Where <level> is a category of requirement : required, recommended optional
+ # level should contain :
+ # SQL File for import With a readable name.
+ # 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');
$langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
- my $dir = C4::Context->config('intranetdir') . "/misc/sql-datas/";
- opendir( MYDIR, $dir );
- my @listdir = grep { !/^\.|CVS/ && -d "$dir/$_" } readdir(MYDIR);
- closedir MYDIR;
- my $frmwklangs = getFrameworkLanguages();
- my @languages;
- map {
- push @languages,
- {
- 'dirname' => $_->{'language_code'},
- 'languagedescription' => $_->{'language_name'},
- 'checked' => ( $_->{'language_code'} eq $langchoice )
- }
- if ( $_->{'language_code'} );
- } @$frmwklangs;
- $template->param( "languagelist" => \@languages );
+ 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 $/;
- $dir =
- C4::Context->config('intranetdir') . "/misc/sql-datas/$langchoice";
- opendir( MYDIR, $dir ) || warn "no open $dir";
- @listdir = 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;
- }
- foreach my $requirelevel (@listdir) {
- $dir =
- C4::Context->config('intranetdir')
- . "/misc/sql-datas/$langchoice/$requirelevel";
- opendir( MYDIR, $dir );
- my @listname =
- grep { !/^\.|CVS/ && -f "$dir/$_" && $_ =~ m/\.sql$/ }
- readdir(MYDIR);
- closedir MYDIR;
- my %cell;
- my @frameworklist;
- map {
- my $name = substr( $_, 0, -4 );
- open FILE, "< $dir/$name.txt";
- my $lines = <FILE>;
- $lines =~ s/\n|\r/<br \/>/g;
- use utf8;
- 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;
- }
- $template->param( "levelloop" => \@levellist );
+ 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 'updatestructure' ) {
+ elsif ( $op && $op eq 'choosemarc' ) {
+ #
+ #
+ # 1ST install, 2nd sub-step : show the user the marcflavour available.
+ #
+ #
- #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/<br \/>/g;
- $string =~
-s/(DBD::mysql.*? failed: .*? line [0-9]*.|=================.*?====================)/<font color=red>$1<\/font>/g;
- $template->param( "updatereport" => $string );
+ #Choose Marc Flavour
+ #sql data are supposed to be located in installer/data/<dbms>/<language>/marcflavour/marcflavourname
+ # Where <dbms> is database type according to DBD syntax
+ # Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
+ # Where <level> 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";
+ }
}
- $template->param( $op => 1 );
+ 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"||"";<INPUT> };
+ push @flavourlist, \%cell;
+ }
+ $template->param( "flavourloop" => \@flavourlist );
+ $template->param( "$op" => 1 );
}
elsif ( $op && $op eq 'importdatastructure' ) {
- #
- #
- # UPDATE (not 1st install) run updatedatabase
- #
- #
-
- #Import data structure and show errors if any
- #Uses DBI to read the file [MJR 2007-07-01]
- my $dbh = DBI->connect(
- "DBI:$info{dbms}:$info{dbname}:$info{hostname}"
- . ( $info{port} ? ":$info{port}" : "" ),
- $info{'user'}, $info{'password'}
- );
- open( INPUT, "<kohastructure.sql" );
- my $file = do { local $/ = undef; <INPUT> };
- my @commands = split( /;/, $file );
- pop @commands;
- map { $dbh->do($_) } @commands;
- close(INPUT);
+ #
+ #
+ # 1st install, 1st "sub-step" : import kohastructure
+ #
+ #
+ my $error = $installer->load_db_schema();
$template->param(
- "error" => $dbh->errstr,
+ "error" => $error,
"$op" => 1,
);
- $dbh->disconnect;
}
- else {
+ elsif ( $op && $op eq 'updatestructure' ) {
+ #
+ # Not 1st install, the only sub-step : update database
+ #
+ #Do updatedatabase And report
+ 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);
-#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.
+ 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 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" ); }
+ 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);
# if there is, then we just need to upgrade
# if there is none, then we need to install the database
#
- my $dbversion = C4::Context->preference('Version');
- $dbversion =~ /(.*)\.(..)(..)(...)/;
- $dbversion = "$1.$2.$3.$4";
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,
# 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(
my ($version) = $rq->fetchrow;
if ($version) {
$query->redirect("install.pl?step=3");
+ exit;
}
}
}
projects / koha.git / blobdiff