From a99c29b309f240b9bd0724bc1de05aaab053a6a9 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 26 Feb 2016 14:08:03 +0000 Subject: [PATCH] Bug 14199 - DBRev 3.23.00.029 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- .../data/mysql/atomicupdate/14199_MarcOrgCode.sql | 3 --- installer/data/mysql/updatedatabase.pl | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/14199_MarcOrgCode.sql diff --git a/Koha.pm b/Koha.pm index 6417f5163c..5682456df7 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "3.23.00.028"; +$VERSION = "3.23.00.029"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/14199_MarcOrgCode.sql b/installer/data/mysql/atomicupdate/14199_MarcOrgCode.sql deleted file mode 100644 index 16b4d36139..0000000000 --- a/installer/data/mysql/atomicupdate/14199_MarcOrgCode.sql +++ /dev/null @@ -1,3 +0,0 @@ --- move marc21_field_003.pl 040c and 040d to marc21_orgcode.pl -update marc_subfield_structure set value_builder='marc21_orgcode.pl' where value_builder IN ( 'marc21_field_003.pl', 'marc21_field_040c.pl', 'marc21_field_040d.pl' ); -update auth_subfield_structure set value_builder='marc21_orgcode.pl' where value_builder IN ( 'marc21_field_003.pl', 'marc21_field_040c.pl', 'marc21_field_040d.pl' ); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0887ae98e7..b600e67c04 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11855,6 +11855,21 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.23.00.029"; +if ( CheckVersion($DBversion) ) { + + # move marc21_field_003.pl 040c and 040d to marc21_orgcode.pl + $dbh->do(q{ + update marc_subfield_structure set value_builder='marc21_orgcode.pl' where value_builder IN ( 'marc21_field_003.pl', 'marc21_field_040c.pl', 'marc21_field_040d.pl' ); + }); + $dbh->do(q{ + update auth_subfield_structure set value_builder='marc21_orgcode.pl' where value_builder IN ( 'marc21_field_003.pl', 'marc21_field_040c.pl', 'marc21_field_040d.pl' ); + }); + + print "Upgrade to $DBversion done (Bug 14199 - Unify all organization code plugins)\n"; + 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.