From 901ab9d483a86e9b5076e6fdc828fd37534bf989 Mon Sep 17 00:00:00 2001 From: David Gustafsson Date: Mon, 4 Apr 2022 15:08:43 +0200 Subject: [PATCH] Bug 20551: Fetch deleted biblios through _get_record_export Signed-off-by: Andrew Fuerste Henry --- Koha/Exporter/Record.pm | 17 +++++++++++------ misc/export_records.pl | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Koha/Exporter/Record.pm b/Koha/Exporter/Record.pm index 388da6f2e2..b143da4b0c 100644 --- a/Koha/Exporter/Record.pm +++ b/Koha/Exporter/Record.pm @@ -31,11 +31,13 @@ sub _get_record_for_export { $record = _get_authority_for_export( { %$params, authid => $record_id } ); } elsif ( $record_type eq 'bibs' ) { $record = _get_biblio_for_export( { %$params, biblionumber => $record_id } ); + } elsif ( $record_type eq 'deleted_bibs' ) { + $record = _get_deleted_biblio_for_export( { %$params, biblionumber => $record_id } ); } else { - Koha::Logger->get->warn("Record_type $record_type not supported."); + Koha::Logger->get->warn("Record type $record_type not supported."); } if ( !$record ) { - Koha::Logger->get->warn("Record $record_id could not be exported."); + Koha::Logger->get->warn("Record $record_id with record type $record_type could not be exported."); return; } @@ -211,7 +213,7 @@ sub export { Koha::Logger->get->warn("No record_type given."); return; } - return unless ( @{$record_ids} || @{$deleted_record_ids} && $format ne 'csv' ); + return unless @{$record_ids} || @{$deleted_record_ids} && $format ne 'csv'; my $fh; if ($output_filepath) { @@ -232,11 +234,14 @@ sub export { my @deleted_records; if ( @{$deleted_record_ids} ) { my $resultset = Koha::Database->new()->schema()->resultset('DeletedbiblioMetadata'); + @deleted_records = map { - my $record = _get_deleted_biblio_for_export( + my $record = _get_record_for_export( { - biblionumber => $_, - resultset => $resultset, + %{$params}, + record_type => 'deleted_bibs', + record_id => $_, + resultset => $resultset } ); $record ? $record : (); diff --git a/misc/export_records.pl b/misc/export_records.pl index c55db62bce..b4f1c4967d 100755 --- a/misc/export_records.pl +++ b/misc/export_records.pl @@ -114,6 +114,9 @@ if ( $include_deleted || $deleted_only ) { if ( $output_format eq 'csv' ) { pod2usage(q|Option "--include_deleted" or "--deleted_only" cannot be used with "--format=csv"|); } + if ( !$timestamp ) { + pod2usage(q|Option "--include_deleted" or "--deleted_only" must be combined with "--date"|); + } } if ( $output_format eq 'csv' and $record_type eq 'auths' ) { -- 2.39.5