From e96d37d1a2f4e2afe0f0f3eb140bb054d08fee4a Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Thu, 11 Jun 2020 15:42:22 -0300
Subject: [PATCH] Bug 25707: (QA follow-up) Clearer message about what's going
 on

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 installer/data/mysql/updatedatabase.pl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 10c7ac05ba3..de5286ead38 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -19229,8 +19229,7 @@ if( CheckVersion( $DBversion ) ) {
         });
     }
 
-#    $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 = $dbh->prepare("SELECT * FROM fieldmapping");
     $sth->execute;
     my @fails_11529;
     if ( $sth->rows ) {
@@ -19269,7 +19268,10 @@ if( CheckVersion( $DBversion ) ) {
               . $fail_11529->{framework}
               . " framework\n";
         }
-        print "You will need to remap using Koha to MARC mappings in administration\n";
+        print "The keyword to marc mapping feature is no longer supported. Above find the\n";
+        print "mappings that had been defined in your system. You will need to remap any\n";
+        print "desired MARC fields to the Koha field you desire in the Koha to MARC mappings\n";
+        print "page under Administration\n";
     }
     print "NOTE: misc/batchRebuildBiblioTables.pl should be run to populate the fields introduced in bug 11529. It may take some time for larger databases.\n\n"
 }
-- 
2.27.0