#!/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
? 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
$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);
}
# 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'");
}
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;
+ $systempreference = '' unless defined $systempreference; # avoid warning
foreach my $file (@fnames) {
# warn $file;
. ( $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
}
"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' ) {
#
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;
};
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;
);
$request->execute;
my ($frameworksloaded) = $request->fetchrow;
+ $frameworksloaded = '' unless defined $frameworksloaded; # avoid warning
my %frameworksloaded;
foreach ( split( /\|/, $frameworksloaded ) ) {
$frameworksloaded{$_} = 1;
my @frameworklist;
map {
my $name = substr( $_, 0, -4 );
- open FILE, "< $dir/$requirelevel/$name.txt";
+ open FILE, "<:utf8","$dir/$requirelevel/$name.txt";
my $lines = <FILE>;
$lines =~ s/\n|\r/<br \/>/g;
use utf8;
};
} @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;
$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;
my @frameworklist;
map {
my $name = substr( $_, 0, -4 );
- open FILE, "< $dir/$requirelevel/$name.txt";
+ open FILE, "<:utf8","$dir/$requirelevel/$name.txt";
my $lines = <FILE>;
$lines =~ s/\n|\r/<br \/>/g;
use utf8;
};
} @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;
$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;
}
. ( $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);
}
# 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_gimpoz / blobdiff