Bugzilla – Attachment 30798 Details for
Bug 11876
Add a diff view to staged MARC records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 11876 - Ommited files in last patch
SIGNED-OFF-Bug-11876---Ommited-files-in-last-patch.patch (text/plain), 4.87 KB, created by
Owen Leonard
on 2014-08-14 19:18:02 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 11876 - Ommited files in last patch
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2014-08-14 19:18:02 UTC
Size:
4.87 KB
patch
obsolete
>From ba7b3bbf3a3596c693fb39e0c958f567318bb6aa Mon Sep 17 00:00:00 2001 >From: mbeaulieu <mbeaulieu@inlibro.com> >Date: Thu, 7 Aug 2014 13:21:58 -0400 >Subject: [PATCH] [SIGNED-OFF] Bug 11876 - Ommited files in last patch >Content-Type: text/plain; charset="utf-8" > >I forgot to include these files in the last patch > > new file: catalogue/showdiffmarc.pl > new file: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > catalogue/showdiffmarc.pl | 99 ++++++++++++++++++++ > .../prog/en/modules/catalogue/showdiffmarc.tt | 50 ++++++++++ > 2 files changed, 149 insertions(+) > create mode 100755 catalogue/showdiffmarc.pl > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt > >diff --git a/catalogue/showdiffmarc.pl b/catalogue/showdiffmarc.pl >new file mode 100755 >index 0000000..8d02643 >--- /dev/null >+++ b/catalogue/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 => "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; >+} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt >new file mode 100644 >index 0000000..7f8f6cb >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/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' %] >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11876
:
25743
|
30590
|
30591
|
30787
|
30797
|
30798
|
30799
|
30800
|
31835
|
31847
|
31871
|
31872
|
31873
|
31874
|
32987
|
32995
|
33052
|
33053
|
33054
|
33055
|
33056