Jonathan Druart
2237e0f871
The commit b5ecefd485
Date: Mon Feb 3 18:46:00 2003 +0000
had a funny description:
Added function to check if a MARC subfield name is "koha-internal"
(instead of checking it for 'lib' and 'tag' everywhere); temporarily
added to Koha.pm
"Temporarily", since 2003, everything is relative, isn't it? :)
The thing is that GetMarcStructure returns hash like
field_200 => {
subfield_a => {
%attributes_of_subfield_a
},
%attributes_of_field_200
}
The attributes for field_200 can be 'repeatable', 'mandatory', 'tag', 'lib'.
We don't want to loop on these values when looping on subfields.
Since there are just { k => v } with v is a scalar (string), it's easier
to test if we are processing a subfield testing the reference.
At some places, we don't need to test that, we are looping on values
from MARC::Field->subfields which are always valid subfields.
Test plan:
1/ Edit items using the batch item mod tool
2/ display and edit items via the cataloguing module.
You should not see any changes between before and after the patch
applied.
Tech notes:
We need to check what we are processing when we loop on 'subfields' from
GetMarcStructure, not from MARC::Field->subfields.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
198 lines
6.3 KiB
Perl
Executable file
198 lines
6.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
# WARNING: 4-character tab stops here
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# 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 3 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, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::AuthoritiesMarc;
|
|
use C4::Koha;
|
|
use C4::Search::History;
|
|
|
|
use Koha::Authority::Types;
|
|
|
|
my $query = new CGI;
|
|
my $op = $query->param('op') || '';
|
|
my $authtypecode = $query->param('authtypecode') || '';
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my $startfrom = $query->param('startfrom');
|
|
my $authid = $query->param('authid');
|
|
$startfrom = 0 if ( !defined $startfrom );
|
|
my ( $template, $loggedinuser, $cookie );
|
|
my $resultsperpage;
|
|
|
|
my $authority_types = Koha::Authority::Types->search({}, { order_by => ['authtypetext']});
|
|
|
|
if ( $op eq "do_search" ) {
|
|
my @marclist = ($query->param('marclist'));
|
|
my @and_or = ($query->param('and_or'));
|
|
my @excluding = ($query->param('excluding'),);
|
|
my @operator = ($query->param('operator'));
|
|
my $orderby = $query->param('orderby');
|
|
my @value = ($query->param('value') || "",);
|
|
|
|
$resultsperpage = $query->param('resultsperpage');
|
|
$resultsperpage = 20 if ( !defined $resultsperpage );
|
|
my @tags;
|
|
my ( $results, $total, @fields ) =
|
|
SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator,
|
|
\@value, $startfrom * $resultsperpage,
|
|
$resultsperpage, $authtypecode, $orderby );
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-authoritiessearchresultlist.tt",
|
|
query => $query,
|
|
type => 'opac',
|
|
authnotrequired => 1,
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# multi page display gestion
|
|
my $displaynext = 0;
|
|
my $displayprev = $startfrom;
|
|
$total ||= 0;
|
|
if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
|
|
$displaynext = 1;
|
|
}
|
|
|
|
my @field_data = (
|
|
{ term => "marclist", val => $marclist[0] },
|
|
{ term => "and_or", val => $and_or[0] },
|
|
{ term => "excluding", val => $excluding[0] },
|
|
{ term => "operator", val => $operator[0] },
|
|
{ term => "value", val => $value[0] },
|
|
);
|
|
|
|
my @numbers = ();
|
|
|
|
if ( $total > $resultsperpage ) {
|
|
for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
|
|
if ( $i < 16 ) {
|
|
my $highlight = 0;
|
|
( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
|
|
push @numbers,
|
|
{
|
|
number => $i,
|
|
highlight => $highlight,
|
|
searchdata => \@field_data,
|
|
startfrom => ( $i - 1 )
|
|
};
|
|
}
|
|
}
|
|
}
|
|
|
|
my $from = $startfrom * $resultsperpage + 1;
|
|
my $to;
|
|
|
|
if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
|
|
$to = $total;
|
|
}
|
|
else {
|
|
$to = ( ( $startfrom + 1 ) * $resultsperpage );
|
|
}
|
|
unless (C4::Context->preference('OPACShowUnusedAuthorities')) {
|
|
my @usedauths = grep { $_->{used} > 0 } @$results;
|
|
$results = \@usedauths;
|
|
}
|
|
|
|
# Opac search history
|
|
if (C4::Context->preference('EnableOpacSearchHistory')) {
|
|
unless ( $startfrom ) {
|
|
my $path_info = $query->url(-path_info=>1);
|
|
my $query_cgi_history = $query->url(-query=>1);
|
|
$query_cgi_history =~ s/^$path_info\?//;
|
|
$query_cgi_history =~ s/;/&/g;
|
|
|
|
unless ( $loggedinuser ) {
|
|
my $new_search = C4::Search::History::add_to_session({
|
|
cgi => $query,
|
|
query_desc => $value[0],
|
|
query_cgi => $query_cgi_history,
|
|
total => $total,
|
|
type => "authority",
|
|
});
|
|
} else {
|
|
# To the session (the user is logged in)
|
|
C4::Search::History::add({
|
|
userid => $loggedinuser,
|
|
sessionid => $query->cookie("CGISESSID"),
|
|
query_desc => $value[0],
|
|
query_cgi => $query_cgi_history,
|
|
total => $total,
|
|
type => "authority",
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
$template->param( result => $results ) if $results;
|
|
$template->param( FIELDS => \@fields );
|
|
$template->param( orderby => $orderby );
|
|
$template->param(
|
|
startfrom => $startfrom,
|
|
displaynext => $displaynext,
|
|
displayprev => $displayprev,
|
|
resultsperpage => $resultsperpage,
|
|
startfromnext => $startfrom + 1,
|
|
startfromprev => $startfrom - 1,
|
|
searchdata => \@field_data,
|
|
countfuzzy => !(C4::Context->preference('OPACShowUnusedAuthorities')),
|
|
total => $total,
|
|
from => $from,
|
|
to => $to,
|
|
resultcount => scalar @$results,
|
|
numbers => \@numbers,
|
|
authtypecode => $authtypecode,
|
|
authtypetext => $authority_types->find($authtypecode)->authtypetext,
|
|
isEDITORS => $authtypecode eq 'EDITORS',
|
|
);
|
|
|
|
}
|
|
else {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-authorities-home.tt",
|
|
query => $query,
|
|
type => 'opac',
|
|
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
}
|
|
|
|
$template->param(
|
|
authority_types => $authority_types,
|
|
authtypecode => $authtypecode,
|
|
);
|
|
|
|
# Print the page
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|
|
|
|
# Local Variables:
|
|
# tab-width: 4
|
|
# End:
|