Attachment 3981 Details for Bug 6239 – Proposed fix

[patch] Proposed fix

0001-Fix-for-Bug-6239-Merging-records-broken.patch (text/plain), 1.61 KB, created by Owen Leonard on 2011-04-21 18:28:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2011-04-21 18:28:33 UTC

Size: 1.61 KB

patch

obsolete

>From afd566ba0a50a27104cf396b6fcf3c0a166815ff Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 21 Apr 2011 14:27:02 -0400
>Subject: [PATCH] Fix for Bug 6239, Merging records broken
>Content-Type: text/plain; charset="utf-8"
>
>---
> cataloguing/merge.pl |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
>index eaf0c97..cc2d01d 100755
>--- a/cataloguing/merge.pl
>+++ b/cataloguing/merge.pl
>@@ -109,11 +109,11 @@ if ($merge) {
>     my @errors_loop  = map{{error => $_}}@errors;
> 
>     # Parameters
>-    $template->param({
>+    $template->param(
> 	errors  => \@errors_loop,
> 	result => 1,
> 	biblio1 => $input->param('biblio1')
>-    });
>+    );
> 
> 
> #-------------------------
>@@ -129,13 +129,13 @@ if ($merge) {
> 
>     # Ask the user to choose which record will be the kept
>     if (not $mergereference) {
>-	$template->param({
>+	$template->param(
> 	    choosereference => 1,	
> 	    biblio1 => $biblionumber[0],
> 	    biblio2 => $biblionumber[1],
> 	    title1 => $data1->{'title'},
> 	    title2 => $data2->{'title'}
>-	    });
>+	    );
>     } else {
> 
> 	if (scalar(@biblionumber) != 2) {
>@@ -165,7 +165,7 @@ if ($merge) {
> 	my @errors_loop  = map{{error => $_}}@errors;
> 
> 	# Parameters
>-	$template->param({
>+	$template->param(
> 	    errors  => \@errors_loop,
> 	    biblio1 => $mergereference,
> 	    biblio2 => $notreference,
>@@ -173,7 +173,7 @@ if ($merge) {
> 	    record1 => @record1,
> 	    record2 => @record2,
> 	    framework => $framework
>-	    });
>+	    );
>     }
> }
> output_html_with_http_headers $input, $cookie, $template->output;
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6239: 3976 | 3981