From 9d34cfb775213720669b50c2570cc693e47ae1d7 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 9 Jun 2020 12:49:54 -0400 Subject: [PATCH] Bug 25707: (bug 11529 follow-up) Do not update marc mappings, print old mappings to upgrade log This patch removes the update of marc frameworks from the updatedatabase script and warns the "MARC to Keyword" (fieldmappings ) to the upgrade log so they can be replaced manually Signed-off-by: David Cook Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit e239e13bc9663dc3d4a43f125761165875b08876) Signed-off-by: Lucas Gass --- installer/data/mysql/updatedatabase.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e2cffe9518..61a663de03 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19229,8 +19229,8 @@ if( CheckVersion( $DBversion ) ) { }); } - $dbh->do("UPDATE marc_subfield_structure JOIN fieldmapping ON tagfield = fieldcode AND subfieldcode=tagsubfield SET kohafield='biblio.subtitle' WHERE fieldmapping.frameworkcode=''"); - $sth = $dbh->prepare("SELECT * FROM fieldmapping WHERE frameworkcode != '' OR field != 'subtitle'"); +# $dbh->do(q{UPDATE marc_subfield_structure JOIN fieldmapping ON tagfield = fieldcode AND subfieldcode=tagsubfield SET kohafield='biblio.subtitle' WHERE fieldmapping.frameworkcode='' AND field = 'subtitle'}); + $sth = $dbh->prepare("SELECT * FROM fieldmapping"); # WHERE frameworkcode != '' OR field != 'subtitle'"); $sth->execute; my @fails_11529; if ( $sth->rows ) { @@ -19259,7 +19259,7 @@ if( CheckVersion( $DBversion ) ) { SetVersion( $DBversion ); print "Upgrade to $DBversion done (Bug 11529: Add medium, subtitle and part information to biblio table)\n"; if ( @fails_11529 ) { - print "WARNING: Not all Keyword to MARC mappings could be preserved\n"; + print "WARNING: Keyword to MARC Mappings:\n"; for my $fail_11529 ( @fails_11529 ) { print " keyword: " . $fail_11529->{field} -- 2.39.5