From fe7630304ece0ae3639204b9198543233fd6d886 Mon Sep 17 00:00:00 2001 From: Jesse Maseto Date: Wed, 12 Mar 2014 06:13:14 -0400 Subject: [PATCH] This patch removes the dupilcate "Standard Number" option under the more options of the opac advanced search. http://bugs.koha-community.org/show_bug.cgi?id=10936 --- catalogue/showdiffmarc.pl | 99 ++++++++++++++++++++ .../prog/en/modules/catalogue/showdiffmarc.tt | 50 ++++++++++ .../bootstrap/en/modules/opac-advsearch.tt | 4 +- .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 2 - opac/.opac-search.pl.swp | Bin 0 -> 24576 bytes 5 files changed, 150 insertions(+), 5 deletions(-) create mode 100755 catalogue/showdiffmarc.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt create mode 100644 opac/.opac-search.pl.swp diff --git a/catalogue/showdiffmarc.pl b/catalogue/showdiffmarc.pl new file mode 100755 index 0000000..3486c8f --- /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..9aad4c1 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showdiffmarc.tt @@ -0,0 +1,50 @@ +[% INCLUDE 'doc-head-open.inc' %] +Koha -- Cataloging: MARC Import + + + +[% INCLUDE 'doc-head-close.inc' %] + + + + +
+
+

Original

+ [% IF ( ERROR_FORMATTED1 ) %] +

The biblionumber [% BIBLIONUMBER %] doesn't match to any record.

+ [% ELSE %] +

[% BIBLIOTITLE %]

+
[% MARC_FORMATTED1 %]
+ [% END %] +
+
+

Imported

+ [% IF ( ERROR_FORMATTED2 ) %] +

The importid [% IMPORTID %] doesn't match to any record.

+ [% ELSE %] +

[% IMPORTTITLE %]

+
[% MARC_FORMATTED2 %] 
+ [% END %] +
+
+ +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index c55eccc..23fa1d5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -81,8 +81,6 @@ [% IF ( expanded_options ) %] [% IF ( numbersphr) %] - [% ELSE %] - [% END %] @@ -392,4 +390,4 @@ }); //]]> -[% END %] \ No newline at end of file +[% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt index 4c1c552..00693fe 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt @@ -114,8 +114,6 @@ [% IF ( expanded_options ) %] [% IF ( numbersphr) %] - [% ELSE %] - [% END %] diff --git a/opac/.opac-search.pl.swp b/opac/.opac-search.pl.swp new file mode 100644 index 0000000000000000000000000000000000000000..5f37308b0a710022cda9ebbbb9b9898290888177 GIT binary patch literal 24576 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