Attachment 164586 Details for Bug 35659 – Bug 35659: (QA follow-up)

[patch] Bug 35659: (QA follow-up)

Bug-35659-QA-follow-up.patch (text/plain), 6.21 KB, created by Matthias Meusburger on 2024-04-10 08:36:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Meusburger

Created: 2024-04-10 08:36:36 UTC

Size: 6.21 KB

patch

obsolete

>From 7ab7cc526cc14d1d6390187f1d157c17b0149aa8 Mon Sep 17 00:00:00 2001
>From: Matthias Meusburger <matthias.meusburger@biblibre.com>
>Date: Wed, 10 Apr 2024 08:24:56 +0000
>Subject: [PATCH] Bug 35659: (QA follow-up)
>
>---
> Koha/OAI/Client/Harvester.pm       | 18 ++++++++----------
> misc/cronjobs/harvest_oai.pl       |  2 +-
> t/db_dependent/Koha/OAIHarvester.t | 25 +++++++++++++++++++++++--
> 3 files changed, 32 insertions(+), 13 deletions(-)
>
>diff --git a/Koha/OAI/Client/Harvester.pm b/Koha/OAI/Client/Harvester.pm
>index f800fb1dc1..433232d8ab 100644
>--- a/Koha/OAI/Client/Harvester.pm
>+++ b/Koha/OAI/Client/Harvester.pm
>@@ -30,9 +30,9 @@ Koha::OAI::Client::Harvester contains OAI-PMH harvester main functions
> use utf8;
> use open qw( :std :utf8 );
> 
>-use C4::Biblio qw( AddBiblio GetFrameworkCode ModBiblio DelBiblio );
>+use C4::Biblio          qw( AddBiblio GetFrameworkCode ModBiblio DelBiblio );
> use C4::AuthoritiesMarc qw (AddAuthority GuessAuthTypeCode ModAuthority DelAuthority );
>-use C4::Log qw( cronlogaction );
>+use C4::Log             qw( cronlogaction );
> use HTTP::OAI;
> use HTTP::OAI::Metadata::OAI_DC;
> use Koha::DateUtils qw( dt_from_string );
>@@ -47,7 +47,7 @@ use MARC::Record;
> use Modern::Perl;
> use DateTime;
> use DateTime::Format::Strptime;
>-use Try::Tiny qw( catch try );
>+use Try::Tiny  qw( catch try );
> use Date::Calc qw(
>     Add_Delta_Days
>     Today
>@@ -88,7 +88,7 @@ sub new {
>     $verbose = $args->{'verbose'};
>     $days    = $args->{'days'};
>     $force   = $args->{'force'};
>-    return $self;
>+    return bless $args, $self;
> }
> 
> =head2 init
>@@ -143,7 +143,6 @@ sub init {
>     if ($days) {
> 
>         # Change this to yyyy-mm-dd
>-        my $dt_today = dt_from_string();
>         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] );
>@@ -296,10 +295,9 @@ sub processRecord {
>                 $status = 'deleted';
>             }
>         } else {
>-            my $existing_dt = $strp->parse_datetime( $imported_record->datestamp );
>-            my $incoming_dt = $strp->parse_datetime( $oai_record->datestamp );
>-
>-            if ( $force || !$incoming_dt || !$existing_dt || $incoming_dt > $existing_dt ) {
>+            my $existing_dt = dt_from_string( $imported_record->datestamp, 'iso' );
>+            my $incoming_dt = $oai_record->datestamp ? dt_from_string( $oai_record->datestamp, 'iso' ) : dt_from_string;
>+            if ( $force || $incoming_dt > $existing_dt ) {
>                 if ( $server->recordtype eq "biblio" ) {
>                     my $biblionumber = $imported_record->biblionumber;
>                     my $result       = ModBiblio( $marcrecord, $biblionumber, GetFrameworkCode($biblionumber) );
>@@ -311,7 +309,7 @@ sub processRecord {
>                 }
>                 $imported_record->update(
>                     {
>-                        datestamp => $imported_record->datestamp,
>+                        datestamp => $incoming_dt,
>                     }
>                 );
>                 $status = 'updated';
>diff --git a/misc/cronjobs/harvest_oai.pl b/misc/cronjobs/harvest_oai.pl
>index 2cc212652d..5471cbe164 100755
>--- a/misc/cronjobs/harvest_oai.pl
>+++ b/misc/cronjobs/harvest_oai.pl
>@@ -25,7 +25,7 @@ use Getopt::Long qw( GetOptions );
> use Koha::Script -cron;
> use Koha::OAI::Client::Harvester;
> use Koha::OaiServers;
>-use C4::Log qw( cronlogaction );
>+use C4::Log   qw( cronlogaction );
> use Try::Tiny qw( catch try );
> 
> my $command_line_options = join( " ", @ARGV );
>diff --git a/t/db_dependent/Koha/OAIHarvester.t b/t/db_dependent/Koha/OAIHarvester.t
>index e42b9a08f4..db973bd268 100755
>--- a/t/db_dependent/Koha/OAIHarvester.t
>+++ b/t/db_dependent/Koha/OAIHarvester.t
>@@ -18,7 +18,7 @@
> # along with Koha; if not, see <http://www.gnu.org/licenses>.
> 
> use Modern::Perl;
>-use Test::More tests => 5;
>+use Test::More tests => 9;
> use Test::Exception;
> 
> use t::lib::TestBuilder;
>@@ -53,13 +53,23 @@ my $record =
>     '<metadata xmlns="http://www.openarchives.org/OAI/2.0/"><oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd"><dc:title>PiÃ¨ces diverses </dc:title><dc:identifier>ARCH/0320 [cote]</dc:identifier><dc:relation>FR-920509801 [RCR Ã©tablissement]</dc:relation><dc:relation>Central obrera boliviana [Fonds ou collection]</dc:relation><dc:format>1 carton</dc:format><dc:date>1971/2000</dc:date><dc:type>Archives et manuscrits</dc:type></oai_dc:dc></metadata>';
> 
> my $r = HTTP::OAI::Record->new();
>-$r->header->datestamp('2017-05-10T09:18:13Z');
> $r->metadata( HTTP::OAI::Metadata->new( dom => $record ) );
> 
> my $status = $harvester->processRecord($r);
> is( $status, 'skipped', 'Record with no identifier is skipped' );
> 
> $r->header->identifier('oai:myarchive.org:oid-233');
>+$status = $harvester->processRecord($r);
>+is( $status, 'added', 'Record with no date is added' );
>+
>+$status = $harvester->processRecord($r);
>+is( $status, 'updated', 'Record with no date is updated' );
>+
>+$status = $harvester->processRecord($r);
>+is( $status, 'updated', 'Record with no date is updated even without force' );
>+
>+$r->header->identifier('oai:myarchive.org:oid-234');
>+$r->header->datestamp('2017-05-10T09:18:13Z');
> 
> $status = $harvester->processRecord($r);
> is( $status, 'added', 'Record is added' );
>@@ -75,4 +85,15 @@ $r->header->datestamp('2018-05-10T09:18:13Z');
> $status = $harvester->processRecord($r);
> is( $status, 'updated', 'When force is not used, record is updated if newer' );
> 
>+my $imported_record = Koha::Import::Oaipmh::Biblios->find( { identifier => 'oai:myarchive.org:oid-234' } );
>+my $added_datestamp = $imported_record->datestamp;
>+$r->header->datestamp(undef);
>+$status          = $harvester->processRecord($r);
>+$imported_record = Koha::Import::Oaipmh::Biblios->find( { identifier => 'oai:myarchive.org:oid-234' } );
>+my $updated_datestamp = $imported_record->datestamp;
>+isnt(
>+    $added_datestamp, $updated_datestamp,
>+    'local datestamp is updated even if there is no datestamp in incoming record'
>+);
>+
> $schema->storage->txn_rollback;
>-- 
>2.30.2

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