Lines 123-141
sub marc_framework_sql_list {
Link Here
|
123 |
|
123 |
|
124 |
undef $/; |
124 |
undef $/; |
125 |
my $dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/$lang/marcflavour/".lc($marcflavour); |
125 |
my $dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/$lang/marcflavour/".lc($marcflavour); |
126 |
unless (opendir( MYDIR, $dir )) { |
126 |
my $dir_h; |
|
|
127 |
unless (opendir( $dir_h, $dir )) { |
127 |
if ($lang eq 'en') { |
128 |
if ($lang eq 'en') { |
128 |
warn "cannot open MARC frameworks directory $dir"; |
129 |
warn "cannot open MARC frameworks directory $dir"; |
129 |
} else { |
130 |
} else { |
130 |
# if no translated MARC framework is available, |
131 |
# if no translated MARC framework is available, |
131 |
# default to English |
132 |
# default to English |
132 |
$dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/en/marcflavour/".lc($marcflavour); |
133 |
$dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/en/marcflavour/".lc($marcflavour); |
133 |
opendir(MYDIR, $dir) or warn "cannot open English MARC frameworks directory $dir"; |
134 |
opendir($dir_h, $dir) or warn "cannot open English MARC frameworks directory $dir"; |
134 |
$defaulted_to_en = 1; |
135 |
$defaulted_to_en = 1; |
135 |
} |
136 |
} |
136 |
} |
137 |
} |
137 |
my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); |
138 |
my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir($dir_h); |
138 |
closedir MYDIR; |
139 |
closedir $dir_h; |
139 |
|
140 |
|
140 |
my @fwklist; |
141 |
my @fwklist; |
141 |
my $request = $self->{'dbh'}->prepare("SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'"); |
142 |
my $request = $self->{'dbh'}->prepare("SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'"); |
Lines 148-156
sub marc_framework_sql_list {
Link Here
|
148 |
} |
149 |
} |
149 |
|
150 |
|
150 |
foreach my $requirelevel (@listdir) { |
151 |
foreach my $requirelevel (@listdir) { |
151 |
opendir( MYDIR, "$dir/$requirelevel" ); |
152 |
my $dir_h; |
152 |
my @listname = grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.(sql|yml)$/ } readdir(MYDIR); |
153 |
opendir( $dir_h, "$dir/$requirelevel" ); |
153 |
closedir MYDIR; |
154 |
my @listname = grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.(sql|yml)$/ } readdir($dir_h); |
|
|
155 |
closedir $dir_h; |
154 |
my %cell; |
156 |
my %cell; |
155 |
my @frameworklist; |
157 |
my @frameworklist; |
156 |
map { |
158 |
map { |
Lines 206-224
sub sample_data_sql_list {
Link Here
|
206 |
|
208 |
|
207 |
undef $/; |
209 |
undef $/; |
208 |
my $dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/$lang"; |
210 |
my $dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/$lang"; |
209 |
unless (opendir( MYDIR, $dir )) { |
211 |
my $dir_h; |
|
|
212 |
unless (opendir( $dir_h, $dir )) { |
210 |
if ($lang eq 'en') { |
213 |
if ($lang eq 'en') { |
211 |
warn "cannot open sample data directory $dir"; |
214 |
warn "cannot open sample data directory $dir"; |
212 |
} else { |
215 |
} else { |
213 |
# if no sample data is available, |
216 |
# if no sample data is available, |
214 |
# default to English |
217 |
# default to English |
215 |
$dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/en"; |
218 |
$dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/en"; |
216 |
opendir(MYDIR, $dir) or warn "cannot open English sample data directory $dir"; |
219 |
opendir($dir_h, $dir) or warn "cannot open English sample data directory $dir"; |
217 |
$defaulted_to_en = 1; |
220 |
$defaulted_to_en = 1; |
218 |
} |
221 |
} |
219 |
} |
222 |
} |
220 |
my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); |
223 |
my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir($dir_h); |
221 |
closedir MYDIR; |
224 |
closedir $dir_h; |
222 |
|
225 |
|
223 |
my @levellist; |
226 |
my @levellist; |
224 |
my $request = $self->{'dbh'}->prepare("SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'"); |
227 |
my $request = $self->{'dbh'}->prepare("SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'"); |
Lines 231-239
sub sample_data_sql_list {
Link Here
|
231 |
} |
234 |
} |
232 |
|
235 |
|
233 |
foreach my $requirelevel (@listdir) { |
236 |
foreach my $requirelevel (@listdir) { |
234 |
opendir( MYDIR, "$dir/$requirelevel" ); |
237 |
my $dir_h; |
235 |
my @listname = grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.(sql|yml)$/ } readdir(MYDIR); |
238 |
opendir( $dir_h, "$dir/$requirelevel" ); |
236 |
closedir MYDIR; |
239 |
my @listname = grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.(sql|yml)$/ } readdir($dir_h); |
|
|
240 |
closedir $dir_h; |
237 |
my %cell; |
241 |
my %cell; |
238 |
my @frameworklist; |
242 |
my @frameworklist; |
239 |
map { |
243 |
map { |
Lines 847-853
sub run_atomic_updates {
Link Here
|
847 |
my $code = read_file( $filepath ); |
851 |
my $code = read_file( $filepath ); |
848 |
my ( $out, $err ) = ('', ''); |
852 |
my ( $out, $err ) = ('', ''); |
849 |
{ |
853 |
{ |
850 |
open my $oldout, ">&STDOUT"; |
854 |
open my $oldout, qw{>}, "&STDOUT"; |
851 |
close STDOUT; |
855 |
close STDOUT; |
852 |
open STDOUT,'>:encoding(utf8)', \$out; |
856 |
open STDOUT,'>:encoding(utf8)', \$out; |
853 |
my $DBversion = Koha::version; # We need $DBversion and $dbh for the eval |
857 |
my $DBversion = Koha::version; # We need $DBversion and $dbh for the eval |