From 8d52332156b42e7df7165ee3eb7b5d3c9c2128a0 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 20 Apr 2015 11:22:22 -0300 Subject: [PATCH] Bug 13322: DBRev 3.19.00.026 Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/updatedatabase.pl | 28 ++++++++++++-------------- kohaversion.pl | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 07c3f0834f..42ccf9b868 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10035,21 +10035,7 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } -# DEVELOPER PROCESS, search for anything to execute in the db_update directory -# SEE bug 13068 -# if there is anything in the atomicupdate, read and execute it. - -my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -opendir( my $dirh, $update_dir ); -while ( my $file = readdir $dirh ) { - next unless $file =~ /\.sql$/; # skip non SQL files - print "DEV atomic update : $file \n"; - my $installer = C4::Installer->new(); - my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; -} - - -$DBversion = "3.19.00.XXX"; +$DBversion = "3.19.00.026"; if(CheckVersion($DBversion)) { if ( C4::Context->preference('marcflavour') eq 'MARC21' ) { $dbh->do(q{ @@ -10156,6 +10142,18 @@ if(CheckVersion($DBversion)) { SetVersion($DBversion); } +# DEVELOPER PROCESS, search for anything to execute in the db_update directory +# SEE bug 13068 +# if there is anything in the atomicupdate, read and execute it. + +my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; +opendir( my $dirh, $update_dir ); +while ( my $file = readdir $dirh ) { + next unless $file =~ /\.sql$/; # skip non SQL files + print "DEV atomic update : $file \n"; + my $installer = C4::Installer->new(); + my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; +} =head1 FUNCTIONS diff --git a/kohaversion.pl b/kohaversion.pl index d2761f30b7..96da662dfc 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -17,7 +17,7 @@ the kohaversion is divided in 4 parts : use strict; sub kohaversion { - our $VERSION = '3.19.00.025'; + our $VERSION = '3.19.00.026'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 2.39.5