View | Details | Raw Unified | Return to bug 20551
Collapse All | Expand All

(-)a/Koha/Exporter/Record.pm (-6 / +11 lines)
Lines 31-41 sub _get_record_for_export { Link Here
31
        $record = _get_authority_for_export( { %$params, authid => $record_id } );
31
        $record = _get_authority_for_export( { %$params, authid => $record_id } );
32
    } elsif ( $record_type eq 'bibs' ) {
32
    } elsif ( $record_type eq 'bibs' ) {
33
        $record = _get_biblio_for_export( { %$params, biblionumber => $record_id } );
33
        $record = _get_biblio_for_export( { %$params, biblionumber => $record_id } );
34
    } elsif ( $record_type eq 'deleted_bibs' ) {
35
        $record = _get_deleted_biblio_for_export( { %$params, biblionumber => $record_id } );
34
    } else {
36
    } else {
35
        Koha::Logger->get->warn("Record_type $record_type not supported.");
37
        Koha::Logger->get->warn("Record type $record_type not supported.");
36
    }
38
    }
37
    if ( !$record ) {
39
    if ( !$record ) {
38
        Koha::Logger->get->warn("Record $record_id could not be exported.");
40
        Koha::Logger->get->warn("Record $record_id with record type $record_type could not be exported.");
39
        return;
41
        return;
40
    }
42
    }
41
43
Lines 211-217 sub export { Link Here
211
        Koha::Logger->get->warn("No record_type given.");
213
        Koha::Logger->get->warn("No record_type given.");
212
        return;
214
        return;
213
    }
215
    }
214
    return unless ( @{$record_ids} || @{$deleted_record_ids} && $format ne 'csv' );
216
    return unless @{$record_ids} || @{$deleted_record_ids} && $format ne 'csv';
215
217
216
    my $fh;
218
    my $fh;
217
    if ($output_filepath) {
219
    if ($output_filepath) {
Lines 232-242 sub export { Link Here
232
        my @deleted_records;
234
        my @deleted_records;
233
        if ( @{$deleted_record_ids} ) {
235
        if ( @{$deleted_record_ids} ) {
234
            my $resultset = Koha::Database->new()->schema()->resultset('DeletedbiblioMetadata');
236
            my $resultset = Koha::Database->new()->schema()->resultset('DeletedbiblioMetadata');
237
235
            @deleted_records = map {
238
            @deleted_records = map {
236
                my $record = _get_deleted_biblio_for_export(
239
                my $record = _get_record_for_export(
237
                    {
240
                    {
238
                        biblionumber => $_,
241
                        %{$params},
239
                        resultset    => $resultset,
242
                        record_type => 'deleted_bibs',
243
                        record_id   => $_,
244
                        resultset   => $resultset
240
                    }
245
                    }
241
                );
246
                );
242
                $record ? $record : ();
247
                $record ? $record : ();
(-)a/misc/export_records.pl (-1 / +3 lines)
Lines 114-119 if ( $include_deleted || $deleted_only ) { Link Here
114
    if ( $output_format eq 'csv' ) {
114
    if ( $output_format eq 'csv' ) {
115
        pod2usage(q|Option "--include_deleted" or "--deleted_only" cannot be used with "--format=csv"|);
115
        pod2usage(q|Option "--include_deleted" or "--deleted_only" cannot be used with "--format=csv"|);
116
    }
116
    }
117
    if ( !$timestamp ) {
118
        pod2usage(q|Option "--include_deleted" or "--deleted_only" must be combined with "--date"|);
119
    }
117
}
120
}
118
121
119
if ( $output_format eq 'csv' and $record_type eq 'auths' ) {
122
if ( $output_format eq 'csv' and $record_type eq 'auths' ) {
120
- 

Return to bug 20551