Bug 10855: Additional marc fields are not inserted

[koha.git] / serials / checkexpiration.pl

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index bf4b6e9..e5abce1 100755 (executable)
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -3,18 +3,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 <http://www.gnu.org/licenses>.
 
 
 =head1 NAME
@@ -44,7 +44,7 @@ The date to filter on.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Serials; # GetExpirationDate
 use C4::Output;
@@ -56,7 +56,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
-        template_name   => "serials/checkexpiration.tmpl",
+        template_name   => "serials/checkexpiration.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -70,7 +70,7 @@ my $issn  = $query->param('issn');
 my $date  = format_date_in_iso($query->param('date'));
 
 if ($date) {
-    my @subscriptions = GetSubscriptions( $title, $issn );
+    my @subscriptions = SearchSubscriptions({ title => $title, issn => $issn, orderby => 'title' });
     my @subscriptions_loop;
 
     foreach my $subscription ( @subscriptions ) {
@@ -79,6 +79,7 @@ if ($date) {
 
         $subscription->{expirationdate} = $expirationdate;
         next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
+        next if $subscription->{closed};
         if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
                         Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
             $subscription->{expirationdate}=format_date($subscription->{expirationdate});
@@ -96,7 +97,6 @@ if ($date) {
     );
 }
 $template->param (
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     (uc(C4::Context->preference("marcflavour"))) => 1
 );
 output_html_with_http_headers $query, $cookie, $template->output;