From f807ebdf7d470cee56248aed516ea3992cb2f2c8 Mon Sep 17 00:00:00 2001
From: mbeaulieu <mbeaulieu@inlibro.com>
Date: Thu, 7 Aug 2014 13:21:58 -0400
Subject: [PATCH] Bug 11876 - Ommited files in last patch
I forgot to include these files in the last patch
new file: tools/showdiffmarc.pl
new file: koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
.../prog/en/modules/tools/showdiffmarc.tt | 50 +++++++++++
tools/showdiffmarc.pl | 99 ++++++++++++++++++++++
2 files changed, 149 insertions(+)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
create mode 100755 tools/showdiffmarc.pl
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
new file mode 100644
index 0000000..2d33c84
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
@@ -0,0 +1,50 @@
+[% 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' %]
diff --git a/tools/showdiffmarc.pl b/tools/showdiffmarc.pl
new file mode 100755
index 0000000..e0e0f7c
--- /dev/null
+++ b/tools/showdiffmarc.pl
@@ -0,0 +1,99 @@
+#!/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 => "tools/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;
+}
--
2.1.0