Skip to content

Commit 24b3f8a

Browse files
committed
Issue #32 - Correctly decrement the Koha version to get the correct data
st been released and we are seeing new tests failing. .sql files from the data directory are not correctly picked, and so data are missing in the DB. while ( not -d $sql_files_dir ) { # FIXME Hum... that smells wrong $version_data_directory--; was obviously wrong :)
1 parent 8bcfb2c commit 24b3f8a

1 file changed

Lines changed: 18 additions & 11 deletions

File tree

insert_data.pl

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,8 @@
5959
our @records_files;
6060
my $has_biblio_metadata = ($VERSION >= "161200004") ? 1 : 0;
6161

62-
if ( -d $sql_files_dir ) {
63-
if ( $version_data_directory eq 1812 and
64-
$VERSION >= "181200011" ) {
65-
$sql_files_dir = "$sql_dir/$lc_marcflavour/$version_data_directory/after_22155";
66-
}
67-
else {
68-
$version_data_directory--;
69-
}
70-
}
71-
7262
while ( not -d $sql_files_dir ) { # FIXME Hum... that smells wrong
73-
$version_data_directory--;
63+
$version_data_directory = decrement_version($version_data_directory);
7464

7565
$sql_files_dir = "$sql_dir/$lc_marcflavour/$version_data_directory";
7666
if ( $version_data_directory >= 1611 ) {
@@ -80,9 +70,14 @@
8070
}
8171
}
8272
}
73+
if ( $version_data_directory eq 1812 and
74+
$VERSION >= "181200011" ) {
75+
$sql_files_dir = "$sql_dir/$lc_marcflavour/$version_data_directory/after_22155";
76+
}
8377
}
8478

8579
@records_files = ( "$sql_files_dir/biblio.sql", "$sql_files_dir/biblioitems.sql", "$sql_files_dir/items.sql", "$sql_files_dir/auth_header.sql" );
80+
use Data::Dumper;warn Dumper \@records_files;
8681
push @records_files, "$sql_files_dir/biblio_metadata.sql" if $has_biblio_metadata;
8782

8883
C4::Context->preference('VOID'); # FIXME master is broken because of 174769e382df - 16520
@@ -280,6 +275,18 @@ sub get_version {
280275
return $version;
281276
}
282277

278+
sub decrement_version {
279+
my ( $version ) = @_;
280+
my ( $major, $minor );
281+
if ( $version =~ m|^(\d{2})(\d{2})$| ) {
282+
( $major, $minor ) = ($1,$2);
283+
}
284+
return sprintf("%s%s", $major, '11') if $minor eq '12'; # Return 18.11 if 18.12
285+
return sprintf("%s%s", $major, '06') if $minor eq '11'; # Return 18.06 if 18.11
286+
return sprintf("%s%s", $major, '05') if $minor eq '06'; # Return 18.05 if 18.06
287+
return sprintf("%s%s", $major-1, '12') if $minor eq '05'; # Return 17.12 if 18.05
288+
}
289+
283290
=head1 SYNOPSIS
284291
285292
insert_data.pl [ --marcflavour <marcflavour> ]

0 commit comments

Comments
 (0)