projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 7756: FIX send email for late orders
[koha_gimpoz]
/
C4
/
Installer.pm
diff --git
a/C4/Installer.pm
b/C4/Installer.pm
old mode 100644
(file)
new mode 100755
(executable)
index
80ef627
..
43fd724
--- a/
C4/Installer.pm
+++ b/
C4/Installer.pm
@@
-354,6
+354,9
@@
sub load_sql_in_order {
$request->execute;
my ($systempreference) = $request->fetchrow;
$systempreference = '' unless defined $systempreference; # avoid warning
$request->execute;
my ($systempreference) = $request->fetchrow;
$systempreference = '' unless defined $systempreference; # avoid warning
+ # Make sure the global sysprefs.sql file is loaded first
+ my $globalsysprefs = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/sysprefs.sql";
+ unshift(@fnames, $globalsysprefs);
foreach my $file (@fnames) {
# warn $file;
undef $/;
foreach my $file (@fnames) {
# warn $file;
undef $/;
@@
-505,8
+508,13
@@
sub load_sql {
my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}";
my $error;
my $strcmd;
my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}";
my $error;
my $strcmd;
+ my $cmd;
if ( $self->{dbms} eq 'mysql' ) {
if ( $self->{dbms} eq 'mysql' ) {
- $strcmd = "mysql "
+ $cmd = qx(which mysql 2>/dev/null || whereis mysql 2>/dev/null);
+ chomp $cmd;
+ $cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/);
+ $cmd = 'mysql' if (!$cmd || !-x $cmd);
+ $strcmd = "$cmd "
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -P $self->{port} " : "" )
. ( $self->{user} ? " -u $self->{user} " : "" )
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -P $self->{port} " : "" )
. ( $self->{user} ? " -u $self->{user} " : "" )
@@
-514,7
+522,11
@@
sub load_sql {
. " $self->{dbname} ";
$error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null);
} elsif ( $self->{dbms} eq 'Pg' ) {
. " $self->{dbname} ";
$error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null);
} elsif ( $self->{dbms} eq 'Pg' ) {
- $strcmd = "psql "
+ $cmd = qx(which psql 2>/dev/null || whereis psql 2>/dev/null);
+ chomp $cmd;
+ $cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/);
+ $cmd = 'psql' if (!$cmd || !-x $cmd);
+ $strcmd = "$cmd "
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -p $self->{port} " : "" )
. ( $self->{user} ? " -U $self->{user} " : "" )
. ( $self->{hostname} ? " -h $self->{hostname} " : "" )
. ( $self->{port} ? " -p $self->{port} " : "" )
. ( $self->{user} ? " -U $self->{user} " : "" )
@@
-526,8
+538,10
@@
sub load_sql {
# report the import a failure although it really succeded -fbcit
}
# errors thrown while loading installer data should be logged
# report the import a failure although it really succeded -fbcit
}
# errors thrown while loading installer data should be logged
- warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
- warn $error;
+ if($error) {
+ warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n";
+ warn "$error";
+ }
return $error;
}
return $error;
}