X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Koha%2FDateUtils.pm;h=e2e92bd494ff637a41771df4486363e5b440950e;hb=1474d95c103c27f90361b5b9b93851aff5d92d0c;hp=35043ffa0d71ff67d920ed753c15321ff920f8b5;hpb=372216b9c845660276fc0a97ece8ee4836c79da0;p=koha_gimpoz diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm index 35043ffa0d..e2e92bd494 100644 --- a/Koha/DateUtils.pm +++ b/Koha/DateUtils.pm @@ -26,7 +26,9 @@ use C4::Context; use base 'Exporter'; use version; our $VERSION = qv('1.0.0'); -our @EXPORT = (qw( dt_from_string output_pref format_sqldatetime output_pref_due )); +our @EXPORT = ( + qw( dt_from_string output_pref format_sqldatetime output_pref_due format_sqlduedatetime) +); =head1 DateUtils @@ -138,7 +140,7 @@ the time portion is stripped if it is '23:59' sub output_pref_due { my $disp_str = output_pref(@_); - $disp_str=~s/ 23:59//; + $disp_str =~ s/ 23:59//; return $disp_str; } @@ -162,4 +164,24 @@ sub format_sqldatetime { return q{}; } +=head2 format_sqlduedatetime + +$string = format_sqldatetime( $string_as_returned_from_db ); + +a convenience routine for calling dt_from_string and formatting the result +with output_pref_due as it is a frequent activity in scripts + +=cut + +sub format_sqlduedatetime { + my $str = shift; + my $force_pref = shift; # if testing we want to override Context + if ( defined $str && $str =~ m/^\d{4}-\d{2}-\d{2}/ ) { + my $dt = dt_from_string( $str, 'sql' ); + $dt->truncate( to => 'minutes' ); + return output_pref_due( $dt, $force_pref ); + } + return q{}; +} + 1;