Bug 21738: make call of CanBookBeReserved more safe

[koha.git] / C4 / Barcodes / annual.pm

diff --git a/C4/Barcodes/annual.pm b/C4/Barcodes/annual.pm
index ae03274..1c8a432 100644 (file)
--- a/C4/Barcodes/annual.pm
+++ b/C4/Barcodes/annual.pm
@@ -4,18 +4,18 @@ package C4::Barcodes::annual;
 #
 # 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>.
 
 use strict;
 use warnings;
@@ -24,33 +24,33 @@ use Carp;
 
 use C4::Context;
 use C4::Debug;
-use C4::Dates;
 
-use vars qw($VERSION @ISA);
+use Koha::DateUtils qw( output_pref dt_from_string );
+
+use vars qw(@ISA);
 use vars qw($debug $cgi_debug);        # from C4::Debug, of course
 use vars qw($width);
 
 BEGIN {
-    $VERSION = 3.07.00.049;
     @ISA = qw(C4::Barcodes);
        $width = 4;
 }
 
 sub db_max ($;$) {
        my $self = shift;
-       my $query = "SELECT max(substring_index(barcode,'-',-1)) AS chunk,barcode FROM items WHERE barcode LIKE ? GROUP BY barcode";
-               # FIXME: unreasonably expensive query on large datasets
+       my $query = "SELECT substring_index(barcode,'-',-1) AS chunk,barcode FROM items WHERE barcode LIKE ? ORDER BY chunk DESC LIMIT 1";
+               # FIXME: unreasonably expensive query on large datasets (I think removal of group by does this?)
        my $sth = C4::Context->dbh->prepare($query);
        my ($iso);
        if (@_) {
                my $input = shift;
-               $iso = C4::Dates->new($input,'iso')->output('iso'); # try to set the date w/ 2nd arg
+        $iso = output_pref({ dt => dt_from_string( $input, 'iso' ), dateformat => 'iso', dateonly => 1 }); # try to set the date w/ 2nd arg
                unless ($iso) {
                        warn "Failed to create 'iso' Dates object with input '$input'.  Reverting to today's date.";
-                       $iso = C4::Dates->new->output('iso');   # failover back to today
+            $iso = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); # failover back to today
                }
        } else {
-               $iso = C4::Dates->new->output('iso');
+        $iso = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
        }
        my $year = substr($iso,0,4);    # YYYY
        $sth->execute("$year-%");
@@ -61,7 +61,7 @@ sub db_max ($;$) {
 
 sub initial () {
        my $self = shift;
-       return substr(C4::Dates->new->output('iso'),0,4) .'-'. sprintf('%'."$width.$width".'d', 1);
+    return substr(output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), 0, 4 ) .'-'. sprintf('%'."$width.$width".'d', 1);
 }
 
 sub parse ($;$) {
@@ -82,7 +82,7 @@ sub width ($;$) {
 sub process_head($$;$$) {      # (self,head,whole,specific)
        my ($self,$head,$whole,$specific) = @_;
        $specific and return $head;     # if this is built off an existing barcode, just return the head unchanged.
-       return substr(C4::Dates->new->output('iso'),0,4) . '-'; # else get new YYYY-
+    return substr(output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), 0, 4 ) . '-'; # else get new YYYY-
 }
 
 sub new_object {