Attachment #26152 for bug #10936

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




#!/usr/bin/perl

# Koha library project  www.koha-community.org

# Copyright 2011 Libéo
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use strict;
use warnings;

# standard or CPAN modules used
use CGI qw(:standard);
use DBI;

# Koha modules used
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Biblio;
use C4::ImportBatch;
use XML::LibXSLT;
use XML::LibXML;


# Input params
my $input        = new CGI;
my $biblionumber = $input->param('id');
my $importid	 = $input->param('importid');


if ( $biblionumber and $importid ) {

	# Init vars
	my ($recordBiblionumber, $recordImportid, $biblioTitle, $importTitle, $formatted1, $formatted2, 
		$errorFormatted1, $errorFormatted2);


	# Prepare template
	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		{
		    template_name   => "catalogue/showdiffmarc.tt",
		    query           => $input,
		    type            => "intranet",
		    authnotrequired => 0,
		    flagsrequired   => { catalogue => 1  },
		    debug           => 1,
		}
	);


	$recordBiblionumber =GetMarcBiblio($biblionumber);
	if( $recordBiblionumber ) {
		$formatted1 = $recordBiblionumber->as_formatted;
		my $data = GetBiblioData($biblionumber);
		$biblioTitle = $data->{title};
	} else {
		$errorFormatted1 = 1;
	}

	my ($marc,$encoding) = GetImportRecordMarc($importid);
	if( $marc ) {
		$recordImportid = MARC::Record->new_from_usmarc($marc) ;
		$formatted2 = $recordImportid->as_formatted;
		my $biblio = GetImportBiblios($importid);
		$importTitle = $biblio->[0]->{'title'};
	} else {
		$errorFormatted2 = 1;
	}


	$template->param( 	SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
						BIBLIONUMBER => $biblionumber,
						IMPORTID => $importid,
						BIBLIOTITLE => $biblioTitle,
						IMPORTTITLE => $importTitle,
						MARC_FORMATTED1 => $formatted1,
						MARC_FORMATTED2 => $formatted2,
						ERROR_FORMATTED1 => $errorFormatted1,
						ERROR_FORMATTED2 => $errorFormatted2
					);

	output_html_with_http_headers $input, $cookie, $template->output;
} else {
	exit;
}




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha -- Cataloging: MARC Import</title>

<style>
div#main {
	width: 100%;
	margin: 10px auto;
}

div.col1,
div.col2 {
	float: left;
	width: 46%;
	margin-left: 3%;
	
}

pre {
	padding: 10px;
	overflow: scroll;
}
</style> 

[% INCLUDE 'doc-head-close.inc' %]

</head>
<body>

<div id="main">
	<div class="col1">
		<h2>Original</h2>
		[% IF ( ERROR_FORMATTED1 ) %]
			<p>The biblionumber <em>[% BIBLIONUMBER %]</em> doesn't match to any record.</p>
		[% ELSE %]
			<h1>[% BIBLIOTITLE %]</h1>
			<pre>[% MARC_FORMATTED1 %]</pre>
		[% END %]
	</div>
	<div class="col2">
		<h2>Imported</h2>
		[% IF ( ERROR_FORMATTED2 ) %]
			<p>The importid <em>[% IMPORTID %]</em> doesn't match to any record.</p>
		[% ELSE %]
			<h1>[% IMPORTTITLE %]</h1>
			<pre>[% MARC_FORMATTED2 %] </pre>
		[% END %]
	</div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]

Lines 81-88 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt (-3 / +1 lines)
81	[% IF ( expanded_options ) %]	81	[% IF ( expanded_options ) %]
82	[% IF ( numbersphr) %]	82	[% IF ( numbersphr) %]
83	<option value="sn,phr">Standard number</option>	83	<option value="sn,phr">Standard number</option>
84	[% ELSE %]
85	<option value="sn">Standard number</option>
86	[% END %]	84	[% END %]
87	<option value="sn">Standard number</option>	85	<option value="sn">Standard number</option>
88	<option value="nb">     ISBN</option>	86	<option value="nb">     ISBN</option>
Lines 392-395 Link Here
392	});	390	});
393	//]]>	391	//]]>
394	</script>	392	</script>
395	[% END %]	393	[% END %]

Lines 114-121 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt (-2 lines)
114	[% IF ( expanded_options ) %]	114	[% IF ( expanded_options ) %]
115	[% IF ( numbersphr) %]	115	[% IF ( numbersphr) %]
116	<option value="sn,phr">Standard number</option>	116	<option value="sn,phr">Standard number</option>
117	[% ELSE %]
118	<option value="sn">Standard number</option>
119	[% END %]	117	[% END %]
120	<option value="sn">Standard number</option>	118	<option value="sn">Standard number</option>
121	<option value="nb">     ISBN</option>	119	<option value="nb">     ISBN</option>

Return to bug 10936

Line 0 Link Here

(-)a/catalogue/showdiffmarc.pl (+99 lines)
		1	#!/usr/bin/perl
		2
		3	# Koha library project www.koha-community.org
		4
		5	# Copyright 2011 Libéo
		6	#
		7	# This file is part of Koha.
		8	#
		9	# Koha is free software; you can redistribute it and/or modify it under the
		10	# terms of the GNU General Public License as published by the Free Software
		11	# Foundation; either version 2 of the License, or (at your option) any later
		12	# version.
		13	#
		14	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		15	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		16	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		17	#
		18	# You should have received a copy of the GNU General Public License along
		19	# with Koha; if not, write to the Free Software Foundation, Inc.,
		20	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		21
		22	use strict;
		23	use warnings;
		24
		25	# standard or CPAN modules used
		26	use CGI qw(:standard);
		27	use DBI;
		28
		29	# Koha modules used
		30	use C4::Context;
		31	use C4::Output;
		32	use C4::Auth;
		33	use C4::Biblio;
		34	use C4::ImportBatch;
		35	use XML::LibXSLT;
		36	use XML::LibXML;
		37
		38
		39	# Input params
		40	my $input = new CGI;
		41	my $biblionumber = $input->param('id');
		42	my $importid = $input->param('importid');
		43
		44
		45	if ( $biblionumber and $importid ) {
		46
		47	# Init vars
		48	my ($recordBiblionumber, $recordImportid, $biblioTitle, $importTitle, $formatted1, $formatted2,
		49	$errorFormatted1, $errorFormatted2);
		50
		51
		52	# Prepare template
		53	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		54	{
		55	template_name => "catalogue/showdiffmarc.tt",
		56	query => $input,
		57	type => "intranet",
		58	authnotrequired => 0,
		59	flagsrequired => { catalogue => 1 },
		60	debug => 1,
		61	}
		62	);
		63
		64
65	$recordBiblionumber =GetMarcBiblio($biblionumber);
66	if( $recordBiblionumber ) {
67	$formatted1 = $recordBiblionumber->as_formatted;
68	my $data = GetBiblioData($biblionumber);
69	$biblioTitle = $data->{title};
70	} else {
71	$errorFormatted1 = 1;
72	}
73
74	my ($marc,$encoding) = GetImportRecordMarc($importid);
75	if( $marc ) {
76	$recordImportid = MARC::Record->new_from_usmarc($marc) ;
77	$formatted2 = $recordImportid->as_formatted;
78	my $biblio = GetImportBiblios($importid);
79	$importTitle = $biblio->[0]->{'title'};
80	} else {
81	$errorFormatted2 = 1;
82	}
83
84
85	$template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
86	BIBLIONUMBER => $biblionumber,
87	IMPORTID => $importid,
88	BIBLIOTITLE => $biblioTitle,
89	IMPORTTITLE => $importTitle,
90	MARC_FORMATTED1 => $formatted1,
91	MARC_FORMATTED2 => $formatted2,
92	ERROR_FORMATTED1 => $errorFormatted1,
93	ERROR_FORMATTED2 => $errorFormatted2
94	);
95
96	output_html_with_http_headers $input, $cookie, $template->output;
97	} else {
98	exit;
99	}

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt (+50 lines)
	1	[% INCLUDE 'doc-head-open.inc' %]
	2	<title>Koha -- Cataloging: MARC Import</title>
	3
	4	<style>
	5	div#main {
	6	width: 100%;
	7	margin: 10px auto;
	8	}
	9
	10	div.col1,
	11	div.col2 {
	12	float: left;
	13	width: 46%;
	14	margin-left: 3%;
	15
	16	}
	17
	18	pre {
	19	padding: 10px;
	20	overflow: scroll;
	21	}
	22	</style>
	23
	24	[% INCLUDE 'doc-head-close.inc' %]
	25
	26	</head>
	27	<body>
	28
	29	<div id="main">
	30	<div class="col1">
	31	<h2>Original</h2>
	32	[% IF ( ERROR_FORMATTED1 ) %]
	33	<p>The biblionumber <em>[% BIBLIONUMBER %]</em> doesn't match to any record.</p>
	34	[% ELSE %]
	35	<h1>[% BIBLIOTITLE %]</h1>
	36	<pre>[% MARC_FORMATTED1 %]</pre>
	37	[% END %]
	38	</div>
	39	<div class="col2">
	40	<h2>Imported</h2>
	41	[% IF ( ERROR_FORMATTED2 ) %]
	42	<p>The importid <em>[% IMPORTID %]</em> doesn't match to any record.</p>
	43	[% ELSE %]
	44	<h1>[% IMPORTTITLE %]</h1>
	45	<pre>[% MARC_FORMATTED2 %] </pre>
	46	[% END %]
	47	</div>
	48	</div>
	49
	50	[% INCLUDE 'intranet-bottom.inc' %]