-#!/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;
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{'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(
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" };
}
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 };
}
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
exit 1;
}
elsif ( $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);
- }
+ $installer->set_version_syspref();
# Installation is finished.
# We just deny anybody access to install
# 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')) {
- $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'");
- }
+ 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
#
- #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] 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;
- foreach my $file (@fnames) {
-
- # warn $file;
- undef $/;
- my $error;
- if ( $info{dbms} eq 'mysql' ) {
- 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} ";
- $error = qx($strcmd < $file 2>&1 1>/dev/null); # We want to send stdout to null and return only stderr... -fbcit
- }
- elsif ( $info{dbms} eq 'Pg' ) {
- my $strcmd = "psql "
- . ( $info{hostname} ? " -h $info{hostname} " : "" )
- . ( $info{port} ? " -p $info{port} " : "" )
- . ( $info{user} ? " -U $info{user} " : "" )
-# . ( $info{password} ? " -W $info{password}" : "" )
- . " $info{dbname} ";
- $error = qx($strcmd -f $file 2>&1 1>/dev/null); # ...even more so with psql...
- }
- 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 );
- 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' ) {
#
# 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.
+ # 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.
$langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
my $marcflavour = $query->param('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/;
- my $request =
- $dbh->prepare(
- "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;
+ $installer->set_marcflavour_syspref($marcflavour);
};
$marcflavour = C4::Context->preference('marcflavour') unless ($marcflavour);
#Insert into database the selected marcflavour
-
- undef $/;
- my $dir =
- C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour/".lc($marcflavour);
- opendir( MYDIR, $dir ) || warn "no open $dir";
- my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR);
- closedir MYDIR;
-
- my @fwklist;
- 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) {
- opendir( MYDIR, "$dir/$requirelevel" );
- my @listname =
- grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.sql$/ }
- readdir(MYDIR);
- closedir MYDIR;
- my %cell;
- my @frameworklist;
- map {
- my $name = substr( $_, 0, -4 );
- open FILE, "< $dir/$requirelevel/$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/$requirelevel/$_",
- '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 @fwklist, \%cell;
- }
- $template->param( "frameworksloop" => \@fwklist );
+ 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));
-
- $dir =
- C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice";
- opendir( MYDIR, $dir ) || warn "no open $dir";
- @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR);
- closedir MYDIR;
- my @levellist;
- foreach my $requirelevel (@listdir) {
- opendir( MYDIR, "$dir/$requirelevel" );
- my @listname =
- grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.sql$/ }
- readdir(MYDIR);
- closedir MYDIR;
- my %cell;
- my @frameworklist;
- map {
- my $name = substr( $_, 0, -4 );
- open FILE, "< $dir/$requirelevel/$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/$requirelevel/$_",
- '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 ($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' ) {
$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");
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"||"";<INPUT> };
push @flavourlist, \%cell;
}
# 1st install, 1st "sub-step" : import kohastructure
#
#
- my $datadir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}";
- my $error;
- if ( $info{dbms} eq 'mysql' ) {
- 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} ";
- $error = qx($strcmd <$datadir/kohastructure.sql 2>&1 1>/dev/null);
- }
- elsif ( $info{dbms} eq 'Pg' ) {
- my $strcmd = "psql "
- . ( $info{hostname} ? " -h $info{hostname} " : "" )
- . ( $info{port} ? " -p $info{port} " : "" )
- . ( $info{user} ? " -U $info{user} " : "" )
-# . ( $info{password} ? " -W $info{password}" : "" ) # psql will NOT accept a password, but prompts...
- . " $info{dbname} "; # Therefore, be sure to run 'trust' on localhost in pg_hba.conf -fbcit
- $error = qx($strcmd -f $datadir/kohastructure.sql 2>&1 1>/dev/null);# Be sure to set 'client_min_messages = error' in postgresql.conf
- # so that only true errors are returned to stderr or else the installer will
- # report the import a failure although it really succeded -fbcit
- }
+ my $error = $installer->load_db_schema();
$template->param(
"error" => $error,
"$op" => 1,
# 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/<br \/>/g;
- $string =~
- s/(DBD::mysql.*? failed: .*? line [0-9]*.|=================.*?====================)/<font color=red>$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 {
# 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