From 2fb6caf021e6cb9c5ef538bbe653f4890789b326 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Tue, 24 Jan 2017 14:53:33 +0100
Subject: [PATCH] Bug 16018: Add a TODO for need_merge_authorities in merge.pl
Content-Type: text/plain; charset=utf-8

It is not useful to postpone a merge to the cron job here, since the
old authority record is deleted and merge_authority cannot yet handle
that correctly. But no harm either to leave it here.

Note: This will be addressed shortly on bug 9988. So please help!

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: mehdi <mehdi@inlibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
EDIT: Typo recordid1 => recordid2 for new record in table.
---
 authorities/merge.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/authorities/merge.pl b/authorities/merge.pl
index 60bc6db..c7fa8cf 100755
--- a/authorities/merge.pl
+++ b/authorities/merge.pl
@@ -66,9 +66,12 @@ if ($merge) {
         my $MARCfrom = GetAuthority( $recordid2 );
         &merge( $recordid2, $MARCfrom, $recordid1, $record );
     } else {
+        # What follows, is actually useless. Because our cron job cannot handle
+        # it adequately. But it does not harm either. Will just be ignored.
+        # FIXME Restructure need_merge_authorities on bug 9988
         my $dbh = C4::Context->dbh;
         my $sqlinsert = "INSERT INTO need_merge_authorities (authid, done) VALUES (?,?)";
-        $dbh->do( $sqlinsert, undef, ( $recordid1, 0 ) );
+        $dbh->do( $sqlinsert, undef, ( $recordid2, 0 ) );
     }
 
     # Deleting the other record
-- 
2.1.4