Bug 29660: Remove hostitemsflag

[koha-ffzg.git] / serials / serials-search.pl

diff --git a/serials/serials-search.pl b/serials/serials-search.pl
index 5d23f21..52d9cdf 100755 (executable)
--- a/serials/serials-search.pl
+++ b/serials/serials-search.pl
@@ -30,17 +30,16 @@ this script is the search page for serials
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Auth;
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Koha qw( GetAuthorisedValues );
-use C4::Output;
-use C4::Serials;
-use Koha::AdditionalField;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Serials qw( CloseSubscription ReopenSubscription SearchSubscriptions check_routing );
+use Koha::AdditionalFields;
 
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::SharedContent;
 
-my $query         = new CGI;
+my $query         = CGI->new;
 my $title         = $query->param('title_filter') || '';
 my $ISSN          = $query->param('ISSN_filter') || '';
 my $EAN           = $query->param('EAN_filter') || '';
@@ -62,9 +61,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "serials/serials-search.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => '*' },
-        debug           => 1,
     }
 );
 
@@ -79,19 +76,16 @@ if ( $op and $op eq "close" ) {
 }
 
 
-my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
-my $additional_field_filters;
-for my $field ( @$additional_fields ) {
-    my $filter_value = $query->param('additional_field_' . $field->{id} . '_filter');
-    if ( defined $filter_value and $filter_value ne q|| ) {
-        $additional_field_filters->{ $field->{name} } = {
-            value => $filter_value,
-            authorised_value_category => $field->{authorised_value_category},
+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,
         };
     }
-    if ( $field->{authorised_value_category} ) {
-        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
-    }
 }
 
 my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
@@ -119,7 +113,7 @@ if ($searched){
             publisher    => $publisher,
             bookseller   => $bookseller,
             branch       => $branch,
-            additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
+            additional_fields => \@additional_field_filters,
             location     => $location,
             expiration_date => $expiration_date_dt,
         });
@@ -142,8 +136,8 @@ if ($mana) {
         expiration_date_filter => $expiration_date_dt,
         done_searched => $searched,
         routing       => $routing,
-        additional_field_filters => $additional_field_filters,
-        additional_fields_for_subscription => $additional_fields,
+        additional_field_filters => \@additional_field_filters,
+        additional_fields_for_subscription => \@additional_fields,
         marcflavour   => (uc(C4::Context->preference("marcflavour"))),
         mana => $mana,
         search_only => 1
@@ -169,7 +163,7 @@ else
         }
     }
 
-    my @branches = Koha::Libraries->search( {}, { order_by => ['branchcode'] } );
+    my @branches = Koha::Libraries->search( {}, { order_by => ['branchcode'] } )->as_list;
     my @branches_loop;
     foreach my $b ( @branches ) {
         my $selected = 0;
@@ -197,8 +191,8 @@ else
         branches_loop => \@branches_loop,
         done_searched => $searched,
         routing       => $routing,
-        additional_field_filters => $additional_field_filters,
-        additional_fields_for_subscription => $additional_fields,
+        additional_field_filters => { map { $_->{id} => $_->{value} } @additional_field_filters },
+        additional_fields_for_subscription => \@additional_fields,
         marcflavour   => (uc(C4::Context->preference("marcflavour"))),
         mana => $mana
     );