X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=serials%2Fserials-search.pl;h=45b85817d1aae0ca1850887554d7fc356c9af75c;hb=6fe65b9744bc6389d3d91fc8968b67254738ab1f;hp=28dc9d00a4deb9e5fb92f0999af63f6625179bcd;hpb=7ca790997ed6adebb7edafc04b6f1aa136ce7cc2;p=koha-ffzg.git diff --git a/serials/serials-search.pl b/serials/serials-search.pl index 28dc9d00a4..45b85817d1 100755 --- a/serials/serials-search.pl +++ b/serials/serials-search.pl @@ -4,18 +4,18 @@ # # 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 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. +# 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. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . =head1 NAME @@ -29,34 +29,39 @@ this script is the search page for serials =cut use Modern::Perl; -use CGI; -use C4::Auth; -use C4::Branch; +use CGI qw ( -utf8 ); +use C4::Auth qw( get_template_and_user ); use C4::Context; -use C4::Output; -use C4::Serials; +use C4::Output qw( output_html_with_http_headers ); +use C4::Serials qw( CloseSubscription ReopenSubscription SearchSubscriptions check_routing ); +use Koha::AdditionalFields; -my $query = new CGI; +use Koha::DateUtils qw( dt_from_string ); +use Koha::SharedContent; + +my $query = CGI->new; my $title = $query->param('title_filter') || ''; my $ISSN = $query->param('ISSN_filter') || ''; my $EAN = $query->param('EAN_filter') || ''; +my $callnumber = $query->param('callnumber_filter') || ''; my $publisher = $query->param('publisher_filter') || ''; my $bookseller = $query->param('bookseller_filter') || ''; my $biblionumber = $query->param('biblionumber') || ''; my $branch = $query->param('branch_filter') || ''; +my $location = $query->param('location_filter') || ''; +my $expiration_date = $query->param('expiration_date_filter') || ''; my $routing = $query->param('routing') || C4::Context->preference("RoutingSerials"); my $searched = $query->param('searched') || 0; -my @subscriptionids = $query ->param('subscriptionid'); +my $mana = $query->param('mana') || 0; +my @subscriptionids = $query->multi_param('subscriptionid'); my $op = $query->param('op'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "serials/serials-search.tmpl", + template_name => "serials/serials-search.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { serials => '*' }, - debug => 1, } ); @@ -70,65 +75,125 @@ if ( $op and $op eq "close" ) { } } + +my @additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription', searchable => 1 } )->as_list; +my @additional_field_filters; +for my $field ( @additional_fields ) { + my $value = $query->param( 'additional_field_' . $field->id ); + if ( defined $value and $value ne '' ) { + push @additional_field_filters, { + id => $field->id, + value => $value, + }; + } +} + my @subscriptions; +my $mana_statuscode; if ($searched){ - @subscriptions = SearchSubscriptions( + if ($mana) { + my $result = Koha::SharedContent::search_entities("subscription",{ + title => $title, + issn => $ISSN, + ean => $EAN, + publisher => $publisher + }); + $mana_statuscode = $result->{code}; + @subscriptions = @{ $result->{data} }; + } + else { + @subscriptions = SearchSubscriptions( { biblionumber => $biblionumber, title => $title, issn => $ISSN, ean => $EAN, + callnumber => $callnumber, publisher => $publisher, bookseller => $bookseller, branch => $branch, - } + additional_fields => \@additional_field_filters, + location => $location, + expiration_date => $expiration_date, + }); + } +} + +if ($mana) { + $template->param( + subscriptions => \@subscriptions, + statuscode => $mana_statuscode, + total => scalar @subscriptions, + title_filter => $title, + ISSN_filter => $ISSN, + EAN_filter => $EAN, + callnumber_filter => $callnumber, + publisher_filter => $publisher, + bookseller_filter => $bookseller, + branch_filter => $branch, + location_filter => $location, + expiration_date_filter => $expiration_date, + done_searched => $searched, + routing => $routing, + additional_field_filters => \@additional_field_filters, + additional_fields_for_subscription => \@additional_fields, + marcflavour => (uc(C4::Context->preference("marcflavour"))), + mana => $mana, + search_only => 1 ); } +else +{ + # to toggle between create or edit routing list options + if ($routing) { + for my $subscription ( @subscriptions) { + $subscription->{routingedit} = check_routing( $subscription->{subscriptionid} ); + } + } -# to toggle between create or edit routing list options -if ($routing) { - for my $subscription ( @subscriptions) { - $subscription->{routingedit} = check_routing( $subscription->{subscriptionid} ); + my (@openedsubscriptions, @closedsubscriptions); + for my $sub ( @subscriptions ) { + unless ( $sub->{closed} ) { + push @openedsubscriptions, $sub + unless $sub->{cannotdisplay}; + } else { + push @closedsubscriptions, $sub + unless $sub->{cannotdisplay}; + } } -} -my (@openedsubscriptions, @closedsubscriptions); -for my $sub ( @subscriptions ) { - unless ( $sub->{closed} ) { - push @openedsubscriptions, $sub - unless $sub->{cannotdisplay}; - } else { - push @closedsubscriptions, $sub - unless $sub->{cannotdisplay}; + my @branches = Koha::Libraries->search( {}, { order_by => ['branchcode'] } )->as_list; + my @branches_loop; + foreach my $b ( @branches ) { + my $selected = 0; + $selected = 1 if( defined $branch and $branch eq $b->branchcode ); + push @branches_loop, { + branchcode => $b->branchcode, + branchname => $b->branchname, + selected => $selected, + }; } -} -my $branches = GetBranches(); -my @branches_loop; -foreach (sort keys %$branches){ - my $selected = 0; - $selected = 1 if( defined $branch and $branch eq $_ ); - push @branches_loop, { - branchcode => $_, - branchname => $branches->{$_}->{'branchname'}, - selected => $selected, - }; + $template->param( + openedsubscriptions => \@openedsubscriptions, + closedsubscriptions => \@closedsubscriptions, + total => @openedsubscriptions + @closedsubscriptions, + title_filter => $title, + ISSN_filter => $ISSN, + EAN_filter => $EAN, + callnumber_filter => $callnumber, + publisher_filter => $publisher, + bookseller_filter => $bookseller, + branch_filter => $branch, + location_filter => $location, + expiration_date_filter => $expiration_date, + branches_loop => \@branches_loop, + done_searched => $searched, + routing => $routing, + additional_field_filters => { map { $_->{id} => $_->{value} } @additional_field_filters }, + additional_fields_for_subscription => \@additional_fields, + marcflavour => (uc(C4::Context->preference("marcflavour"))), + mana => $mana + ); } - -$template->param( - openedsubscriptions => \@openedsubscriptions, - closedsubscriptions => \@closedsubscriptions, - total => @openedsubscriptions + @closedsubscriptions, - title_filter => $title, - ISSN_filter => $ISSN, - EAN_filter => $EAN, - publisher_filter => $publisher, - bookseller_filter => $bookseller, - branch_filter => $branch, - branches_loop => \@branches_loop, - done_searched => $searched, - routing => $routing, - marcflavour => (uc(C4::Context->preference("marcflavour"))) -); - output_html_with_http_headers $query, $cookie, $template->output;