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
5.8 KiB
Perl
Executable file
198 lines
5.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# 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 URI::Escape;
|
|
use C4::Auth;
|
|
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::AuthoritiesMarc;
|
|
use C4::Acquisition;
|
|
use C4::Koha;
|
|
use C4::Biblio;
|
|
use C4::Search::History;
|
|
|
|
use Koha::Authority::Types;
|
|
|
|
my $query = new CGI;
|
|
my $dbh = C4::Context->dbh;
|
|
my $op = $query->param('op') || '';
|
|
my $authtypecode = $query->param('authtypecode') || '';
|
|
my $authid = $query->param('authid') || '';
|
|
|
|
my ( $template, $loggedinuser, $cookie );
|
|
|
|
my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypetext'] } );
|
|
|
|
if ( $op eq "delete" ) {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "authorities/authorities-home.tt",
|
|
query => $query,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
&DelAuthority( $authid, 1 );
|
|
|
|
if ( $query->param('operator') ) {
|
|
# query contains search params so perform search
|
|
$op = "do_search";
|
|
}
|
|
else {
|
|
$op = '';
|
|
}
|
|
}
|
|
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') || '';
|
|
|
|
my $startfrom = $query->param('startfrom') || 1;
|
|
my $resultsperpage = $query->param('resultsperpage') || 20;
|
|
|
|
my ( $results, $total ) = SearchAuthorities(
|
|
[$marclist], [$and_or],
|
|
[$excluding], [$operator],
|
|
[$value], ( $startfrom - 1 ) * $resultsperpage,
|
|
$resultsperpage, $authtypecode,
|
|
$orderby
|
|
);
|
|
|
|
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "authorities/searchresultlist.tt",
|
|
query => $query,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# search history
|
|
if (C4::Context->preference('EnableSearchHistory')) {
|
|
if ( $startfrom == 1) {
|
|
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;
|
|
|
|
C4::Search::History::add({
|
|
userid => $loggedinuser,
|
|
sessionid => $query->cookie("CGISESSID"),
|
|
query_desc => $value,
|
|
query_cgi => $query_cgi_history,
|
|
total => $total,
|
|
type => "authority",
|
|
});
|
|
}
|
|
}
|
|
|
|
$template->param(
|
|
marclist => $marclist,
|
|
and_or => $and_or,
|
|
excluding => $excluding,
|
|
operator => $operator,
|
|
orderby => $orderby,
|
|
value => $value,
|
|
authtypecode => $authtypecode,
|
|
startfrom => $startfrom,
|
|
resultsperpage => $resultsperpage,
|
|
);
|
|
|
|
# we must get parameters once again. Because if there is a mainentry, it
|
|
# has been replaced by something else during the search, thus the links
|
|
# next/previous would not work anymore
|
|
|
|
# construction of the url of each page
|
|
my $value_url = uri_escape_utf8($value);
|
|
my $base_url = "authorities-home.pl?"
|
|
."marclist=$marclist"
|
|
."&and_or=$and_or"
|
|
."&excluding=$excluding"
|
|
."&operator=$operator"
|
|
."&value=$value_url"
|
|
."&resultsperpage=$resultsperpage"
|
|
."&type=intranet"
|
|
."&op=do_search"
|
|
."&authtypecode=$authtypecode"
|
|
."&orderby=$orderby";
|
|
|
|
my $from = ( $startfrom - 1 ) * $resultsperpage + 1;
|
|
my $to;
|
|
if ( !defined $total ) {
|
|
$total = 0;
|
|
}
|
|
|
|
if ( $total < $startfrom * $resultsperpage ) {
|
|
$to = $total;
|
|
}
|
|
else {
|
|
$to = $startfrom * $resultsperpage;
|
|
}
|
|
|
|
$template->param( result => $results ) if $results;
|
|
|
|
$template->param(
|
|
pagination_bar => pagination_bar(
|
|
$base_url, int( $total / $resultsperpage ) + 1,
|
|
$startfrom, 'startfrom'
|
|
),
|
|
total => $total,
|
|
from => $from,
|
|
to => $to,
|
|
isEDITORS => $authtypecode eq 'EDITORS',
|
|
);
|
|
|
|
}
|
|
if ( $op eq '' ) {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "authorities/authorities-home.tt",
|
|
query => $query,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
}
|
|
|
|
$template->param(
|
|
authority_types => $authority_types,
|
|
op => $op,
|
|
);
|
|
|
|
$template->{VARS}->{marcflavour} = C4::Context->preference("marcflavour");
|
|
|
|
# Print the page
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|