View | Details | Raw Unified | Return to bug 6239
Collapse All | Expand All

(-)a/cataloguing/merge.pl (-7 / +6 lines)
Lines 109-119 if ($merge) { Link Here
109
    my @errors_loop  = map{{error => $_}}@errors;
109
    my @errors_loop  = map{{error => $_}}@errors;
110
110
111
    # Parameters
111
    # Parameters
112
    $template->param({
112
    $template->param(
113
	errors  => \@errors_loop,
113
	errors  => \@errors_loop,
114
	result => 1,
114
	result => 1,
115
	biblio1 => $input->param('biblio1')
115
	biblio1 => $input->param('biblio1')
116
    });
116
    );
117
117
118
118
119
#-------------------------
119
#-------------------------
Lines 129-141 if ($merge) { Link Here
129
129
130
    # Ask the user to choose which record will be the kept
130
    # Ask the user to choose which record will be the kept
131
    if (not $mergereference) {
131
    if (not $mergereference) {
132
	$template->param({
132
	$template->param(
133
	    choosereference => 1,	
133
	    choosereference => 1,	
134
	    biblio1 => $biblionumber[0],
134
	    biblio1 => $biblionumber[0],
135
	    biblio2 => $biblionumber[1],
135
	    biblio2 => $biblionumber[1],
136
	    title1 => $data1->{'title'},
136
	    title1 => $data1->{'title'},
137
	    title2 => $data2->{'title'}
137
	    title2 => $data2->{'title'}
138
	    });
138
	    );
139
    } else {
139
    } else {
140
140
141
	if (scalar(@biblionumber) != 2) {
141
	if (scalar(@biblionumber) != 2) {
Lines 165-171 if ($merge) { Link Here
165
	my @errors_loop  = map{{error => $_}}@errors;
165
	my @errors_loop  = map{{error => $_}}@errors;
166
166
167
	# Parameters
167
	# Parameters
168
	$template->param({
168
	$template->param(
169
	    errors  => \@errors_loop,
169
	    errors  => \@errors_loop,
170
	    biblio1 => $mergereference,
170
	    biblio1 => $mergereference,
171
	    biblio2 => $notreference,
171
	    biblio2 => $notreference,
Lines 173-179 if ($merge) { Link Here
173
	    record1 => @record1,
173
	    record1 => @record1,
174
	    record2 => @record2,
174
	    record2 => @record2,
175
	    framework => $framework
175
	    framework => $framework
176
	    });
176
	    );
177
    }
177
    }
178
}
178
}
179
output_html_with_http_headers $input, $cookie, $template->output;
179
output_html_with_http_headers $input, $cookie, $template->output;
180
- 

Return to bug 6239