Attachment #5731 for bug #6210

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




use C4::Items;
use C4::Biblio;
use C4::Serials;
use C4::Koha;

my $input = new CGI;
my @biblionumber = $input->param('biblionumber');

	push @errors, $error if ($error); 
    }

    # Errors
    my @errors_loop  = map{{error => $_}}@errors;

    # Parameters
    $template->param(
	errors  => \@errors_loop,
	result => 1,
	biblio1 => $input->param('biblio1')
    );


#-------------------------
# Show records to merge
#-------------------------
} else {

    my $mergereference = $input->param('mergereference');
    my $biblionumber = $input->param('biblionumber');

    if (scalar(@biblionumber) != 2) {
        push @errors, "An unexpected number of records was provided for merging. Currently only two records at a time can be merged.";
    }
    else {
        my $data1 = GetBiblioData($biblionumber[0]);
        my $data2 = GetBiblioData($biblionumber[1]);

        # Checks if both records use the same framework
        my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);
        my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);

        if ($mergereference) {

            my $framework;
            if ($frameworkcode1 ne $frameworkcode2) {
                $framework = $input->param('frameworkcode')
                  or push @errors, "Famework not selected.";
            } else {
                $framework = $frameworkcode1;	
            }

            # Getting MARC Structure
            my $tagslib = GetMarcStructure(1, $framework);

            my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];

            # Creating a loop for display
            my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);
            my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);

            # Parameters
            $template->param(
                biblio1 => $mergereference,
                biblio2 => $notreference,
                mergereference => $mergereference,
                record1 => @record1,
                record2 => @record2,
                framework => $framework
            );
        }
        else {

        # Ask the user to choose which record will be the kept
            $template->param(
                choosereference => 1,	
                biblio1 => $biblionumber[0],
                biblio2 => $biblionumber[1],
                title1 => $data1->{'title'},
                title2 => $data2->{'title'}
            );
            if ($frameworkcode1 ne $frameworkcode2) {
                my $frameworks = getframeworks;
                my @frameworkselect;
                foreach my $thisframeworkcode ( keys %$frameworks ) {
                    my %row = (
                        value         => $thisframeworkcode,
                        frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
                    );
                    if ($frameworkcode1 eq $thisframeworkcode){
                        $row{'selected'} = 1;
                        }
                    push @frameworkselect, \%row;
                }
                $template->param(
                    frameworkselect => \@frameworkselect,
                    frameworkcode1 => $frameworkcode1,
                    frameworkcode2 => $frameworkcode2,
                );
            }
        }
    }
}

if (@errors) {
    # Errors
    my @errors_loop  = map{{error => $_}}@errors;
    $template->param( errors  => \@errors_loop );
}

output_html_with_http_headers $input, $cookie, $template->output;
exit;


Lines 161-166 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-3 / +30 lines)
161		161
162	});	162	});
163		163
		164	function changeFramework(fw) {
		165	$("#Frameworks").val(fw);
		166	}
		167
164	//]]>	168	//]]>
165	</script>	169	</script>
166	</head>	170	</head>
Lines 194-203 $(document).ready(function(){ Link Here
194	<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">	198	<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">
195	<fieldset class="rows">	199	<fieldset class="rows">
196	<legend>Merge reference</legend>	200	<legend>Merge reference</legend>
		201	<table>
		202	<tr>
		203	<td style="border-width: 0px; text-align: left">
197	<ol>	204	<ol>
198	<li class="radio"><input type="radio" value="[% biblio1 %]" checked="checked" id="mergereference1" name="mergereference" /><label style="float:none" for="mergereference1">[% title1 %] ([% biblio1 %])</label></li>	205	<li class="radio"><input type="radio" value="[% biblio1 %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 %]')" /><label style="float:none" for="mergereference1">[% title1 %] ([% biblio1 %])</label></li>
199	<li class="radio"><input type="radio" value="[% biblio2 %]" id="mergereference2" name="mergereference" /><label style="float:none" for="mergereference2">[% title2 %] ([% biblio2 %])</label></li>	206	<li class="radio"><input type="radio" value="[% biblio2 %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 %]')" /><label style="float:none" for="mergereference2">[% title2 %] ([% biblio2 %])</label></li>
200	</ol>	207	</ol>
		208	</td>
		209	<td style="border-width: 0px">
		210	[% IF frameworkselect %]
		211	<label style="float:none" for="frameworkcode">Framework:</label><br>
		212	<select name="frameworkcode" id="Frameworks">
		213	<option value="Default">Default</option>
		214	[% FOREACH frameworkcodeloo IN frameworkselect %]
		215	[% IF ( frameworkcodeloo.selected ) %]
		216	<option value="[% frameworkcodeloo.value %]" selected="selected">
		217	[% ELSE %]
		218	<option value="[% frameworkcodeloo.value %]">
		219	[% END %]
		220	[% frameworkcodeloo.frameworktext %]
		221	</option>
		222	[% END %]
		223	</select>
		224	[% END %]
		225	</td>
		226	</tr>
		227	</table>
		228
201	<input type="hidden" name="biblionumber" value="[% biblio1 %]" />	229	<input type="hidden" name="biblionumber" value="[% biblio1 %]" />
202	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />	230	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />
203	<fieldset class="action"><input type="submit" value="Next" /></fieldset>	231	<fieldset class="action"><input type="submit" value="Next" /></fieldset>
204	-

Return to bug 6210

Lines 26-31 use C4::Auth; Link Here

(-)a/cataloguing/merge.pl (-56 / +78 lines)
26	use C4::Items;	26	use C4::Items;
27	use C4::Biblio;	27	use C4::Biblio;
28	use C4::Serials;	28	use C4::Serials;
		29	use C4::Koha;
29		30
30	my $input = new CGI;	31	my $input = new CGI;
31	my @biblionumber = $input->param('biblionumber');	32	my @biblionumber = $input->param('biblionumber');
Lines 104-180 if ($merge) { Link Here
104	push @errors, $error if ($error);	105	push @errors, $error if ($error);
105	}	106	}
106		107
107	# Errors
108	my @errors_loop = map{{error => $_}}@errors;
109
110	# Parameters	108	# Parameters
111	$template->param(	109	$template->param(
112	errors => \@errors_loop,
113	result => 1,	110	result => 1,
114	biblio1 => $input->param('biblio1')	111	biblio1 => $input->param('biblio1')
115	);	112	);
116		113
117
118	#-------------------------	114	#-------------------------
119	# Show records to merge	115	# Show records to merge
120	#-------------------------	116	#-------------------------
121	} else {	117	} else {
122
123	my $mergereference = $input->param('mergereference');	118	my $mergereference = $input->param('mergereference');
124	my $biblionumber = $input->param('biblionumber');	119	my $biblionumber = $input->param('biblionumber');
125		120
126	my $data1 = GetBiblioData($biblionumber[0]);	121	if (scalar(@biblionumber) != 2) {
127	my $data2 = GetBiblioData($biblionumber[1]);	122	push @errors, "An unexpected number of records was provided for merging. Currently only two records at a time can be merged.";
128		123	}
129	# Ask the user to choose which record will be the kept	124	else {
130	if (not $mergereference) {	125	my $data1 = GetBiblioData($biblionumber[0]);
131	$template->param(	126	my $data2 = GetBiblioData($biblionumber[1]);
132	choosereference => 1,	127
133	biblio1 => $biblionumber[0],	128	# Checks if both records use the same framework
134	biblio2 => $biblionumber[1],	129	my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);
135	title1 => $data1->{'title'},	130	my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);
136	title2 => $data2->{'title'}	131
137	);	132	if ($mergereference) {
138	} else {	133
139		134	my $framework;
140	if (scalar(@biblionumber) != 2) {	135	if ($frameworkcode1 ne $frameworkcode2) {
141	push @errors, "An unexpected number of records was provided for merging. Currently only two records at a time can be merged.";	136	$framework = $input->param('frameworkcode')
142	}	137	or push @errors, "Famework not selected.";
143		138	} else {
144	# Checks if both records use the same framework	139	$framework = $frameworkcode1;
145	my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);	140	}
146	my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);	141
147	my $framework;	142	# Getting MARC Structure
148	if ($frameworkcode1 ne $frameworkcode2) {	143	my $tagslib = GetMarcStructure(1, $framework);
149	push @errors, "The records selected for merging are using different frameworks. Currently merging is only available for records using the same framework.";	144
150	} else {	145	my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];
151	$framework = $frameworkcode1;	146
152	}	147	# Creating a loop for display
153		148	my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);
154	# Getting MARC Structure	149	my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);
155	my $tagslib = GetMarcStructure(1, $framework);	150
156		151	# Parameters
157	my $notreference = ($biblionumber[0] == $mergereference) ? $biblionumber[1] : $biblionumber[0];	152	$template->param(
158		153	biblio1 => $mergereference,
159	# Creating a loop for display	154	biblio2 => $notreference,
160	my @record1 = _createMarcHash(GetMarcBiblio($mergereference), $tagslib);	155	mergereference => $mergereference,
161	my @record2 = _createMarcHash(GetMarcBiblio($notreference), $tagslib);	156	record1 => @record1,
162		157	record2 => @record2,
163	# Errors	158	framework => $framework
164	my @errors_loop = map{{error => $_}}@errors;	159	);
165		160	}
166	# Parameters	161	else {
167	$template->param(	162
168	errors => \@errors_loop,	163	# Ask the user to choose which record will be the kept
169	biblio1 => $mergereference,	164	$template->param(
170	biblio2 => $notreference,	165	choosereference => 1,
171	mergereference => $mergereference,	166	biblio1 => $biblionumber[0],
172	record1 => @record1,	167	biblio2 => $biblionumber[1],
173	record2 => @record2,	168	title1 => $data1->{'title'},
174	framework => $framework	169	title2 => $data2->{'title'}
175	);	170	);
		171	if ($frameworkcode1 ne $frameworkcode2) {
		172	my $frameworks = getframeworks;
		173	my @frameworkselect;
		174	foreach my $thisframeworkcode ( keys %$frameworks ) {
		175	my %row = (
		176	value => $thisframeworkcode,
		177	frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
		178	);
		179	if ($frameworkcode1 eq $thisframeworkcode){
		180	$row{'selected'} = 1;
		181	}
		182	push @frameworkselect, \%row;
		183	}
		184	$template->param(
		185	frameworkselect => \@frameworkselect,
		186	frameworkcode1 => $frameworkcode1,
		187	frameworkcode2 => $frameworkcode2,
		188	);
		189	}
		190	}
176	}	191	}
177	}	192	}
		193
		194	if (@errors) {
		195	# Errors
		196	my @errors_loop = map{{error => $_}}@errors;
		197	$template->param( errors => \@errors_loop );
		198	}
		199
178	output_html_with_http_headers $input, $cookie, $template->output;	200	output_html_with_http_headers $input, $cookie, $template->output;
179	exit;	201	exit;
180		202