Attachment 174790 Details for Bug 35659 – Bug 35659: (QA follow-up) Fix DateTime and cronlogaction messages

[patch] Bug 35659: (QA follow-up) Fix DateTime and cronlogaction messages

Bug-35659-QA-follow-up-Fix-DateTime-and-cronlogact.patch (text/plain), 2.01 KB, created by Matthias Meusburger on 2024-11-19 13:58:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Meusburger

Created: 2024-11-19 13:58:00 UTC

Size: 2.01 KB

patch

obsolete

>From 42ce1d6ae69158d0626baab5566e6049e5c46c39 Mon Sep 17 00:00:00 2001
>From: Matthias Meusburger <matthias.meusburger@biblibre.com>
>Date: Tue, 19 Nov 2024 13:54:41 +0000
>Subject: [PATCH] Bug 35659: (QA follow-up) Fix DateTime and cronlogaction
> messages
>
>---
> Koha/OAI/Client/Harvester.pm | 7 +------
> misc/cronjobs/harvest_oai.pl | 5 ++---
> 2 files changed, 3 insertions(+), 9 deletions(-)
>
>diff --git a/Koha/OAI/Client/Harvester.pm b/Koha/OAI/Client/Harvester.pm
>index 9e60214be16..ed83d3d36de 100644
>--- a/Koha/OAI/Client/Harvester.pm
>+++ b/Koha/OAI/Client/Harvester.pm
>@@ -52,11 +52,6 @@ use Date::Calc qw(
>     Today
> );
> 
>-my $strp = DateTime::Format::Strptime->new(
>-    pattern   => '%FT%TZ',
>-    time_zone => 'floating',
>-);
>-
> our $xslt_engine = Koha::XSLT::Base->new;
> 
> =head2 new
>@@ -136,7 +131,7 @@ sub init {
>         # Change this to yyyy-mm-dd
>         my ( $nowyear, $nowmonth, $nowday ) = Today();
>         my @date     = Add_Delta_Days( $nowyear, $nowmonth, $nowday, -$days );
>-        my $dt_start = DateTime->new( year => $date[0], month => $date[1], day => $date[2] );
>+        my $dt_start = dt_from_string( $date[0] . '-' . $date[1] . '-' . $date[2] );
>         $start_date = $dt_start->ymd();
>         $self->printlog("Harvesting from $start_date");
>     }
>diff --git a/misc/cronjobs/harvest_oai.pl b/misc/cronjobs/harvest_oai.pl
>index 554049304ae..050232a6752 100755
>--- a/misc/cronjobs/harvest_oai.pl
>+++ b/misc/cronjobs/harvest_oai.pl
>@@ -99,14 +99,13 @@ try {
>     exit;
> };
> 
>-cronlogaction( { action => 'Start', info => "Starting OAI Harvest" } );
>-cronlogaction( { info   => "Command line: $command_line_options" } );
>+cronlogaction( { info => $command_line_options } );
> 
> my $harvester =
>     Koha::OAI::Client::Harvester->new( { server => $server, days => $days, force => $force, logger => \&logFunction } );
> $harvester->init();
> 
>-cronlogaction( { action => 'End', info => "Ending OAI Harvest" } );
>+cronlogaction( { action => 'End', info => "COMPLETED" } );
> 
> sub logFunction {
>     my $message = shift;
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 35659: 160356 | 160357 | 160744 | 161813 | 161960 | 162004 | 162005 | 162006 | 162007 | 162008 | 162009 | 162010 | 162011 | 162527 | 162528 | 162692 | 162693 | 162694 | 163527 | 164586 | 164590 | 164602 | 164603 | 164604 | 164605 | 164606 | 164618 | 164619 | 164620 | 164621 | 164622 | 165199 | 165594 | 165595 | 165596 | 165597 | 165598 | 167106 | 167107 | 167171 | 167172 | 167173 | 167174 | 167175 | 167176 | 168982 | 168983 | 169941 | 171255 | 171258 | 171260 | 171264 | 171265 | 171267 | 171675 | 171676 | 171678 | 171679 | 172072 | 172073 | 172074 | 172075 | 172076 | 172077 | 172078 | 172079 | 172080 | 172081 | 172082 | 172083 | 172202 | 172203 | 172204 | 172205 | 172206 | 172207 | 172208 | 172209 | 172210 | 172211 | 172212 | 172213 | 173088 | 173089 | 173090 | 173091 | 173092 | 173093 | 173094 | 173095 | 173096 | 173097 | 173098 | 173099 | 173100 | 173101 | 173561 | 173599 | 173600 | 173601 | 173614 | 174790