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

(-)a/Koha/Exporter/Record.pm (-12 / +15 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 117-124 sub _get_deleted_biblio_for_export { Link Here
117
    my $biblionumber = $params->{biblionumber};
119
    my $biblionumber = $params->{biblionumber};
118
    # Creating schema is expensive, allow caller to
120
    # Creating schema is expensive, allow caller to
119
    # pass it so don't have to recreate for each call
121
    # pass it so don't have to recreate for each call
120
    my $resultset = $params->{resultset} || Koha::Database
122
    my $resultset = $params->{resultset} || Koha::Database->new()
121
        ->new()
122
        ->schema()
123
        ->schema()
123
        ->resultset('DeletedbiblioMetadata');
124
        ->resultset('DeletedbiblioMetadata');
124
    my $marc_flavour = C4::Context->preference('marcflavour');
125
    my $marc_flavour = C4::Context->preference('marcflavour');
Lines 218-224 sub export { Link Here
218
        Koha::Logger->get->warn( "No record_type given." );
219
        Koha::Logger->get->warn( "No record_type given." );
219
        return;
220
        return;
220
    }
221
    }
221
    return unless (@{$record_ids} || @{$deleted_record_ids} && $format ne 'csv');
222
    return unless @{$record_ids} || @{$deleted_record_ids} && $format ne 'csv';
222
223
223
    my $fh;
224
    my $fh;
224
    if ( $output_filepath ) {
225
    if ( $output_filepath ) {
Lines 238-251 sub export { Link Here
238
239
239
        my @deleted_records;
240
        my @deleted_records;
240
        if (@{$deleted_record_ids}) {
241
        if (@{$deleted_record_ids}) {
241
            my $resultset = Koha::Database
242
            my $resultset = Koha::Database->new()
242
            ->new()
243
                ->schema()
243
            ->schema()
244
                ->resultset('DeletedbiblioMetadata');
244
            ->resultset('DeletedbiblioMetadata');
245
245
            @deleted_records = map {
246
            @deleted_records = map {
246
                my $record = _get_deleted_biblio_for_export({
247
                my $record = _get_record_for_export({
247
                    biblionumber => $_,
248
                    %{$params},
248
                    resultset => $resultset,
249
                    record_type => 'deleted_bibs',
250
                    record_id => $_,
251
                    resultset => $resultset
249
                });
252
                });
250
                $record ? $record : ();
253
                $record ? $record : ();
251
            } @{$deleted_record_ids};
254
            } @{$deleted_record_ids};
(-)a/misc/export_records.pl (-2 / +4 lines)
Lines 108-119 $record_type ||= 'bibs'; Link Here
108
$output_format = 'iso2709' if $output_format eq 'marc';
108
$output_format = 'iso2709' if $output_format eq 'marc';
109
109
110
if ($include_deleted || $deleted_only) {
110
if ($include_deleted || $deleted_only) {
111
   if ($record_type ne 'bibs') {
111
    if ($record_type ne 'bibs') {
112
        pod2usage(q|Option "--include_deleted" or "--deleted_only" can only be used with "--record-type=bibs"|);
112
        pod2usage(q|Option "--include_deleted" or "--deleted_only" can only be used with "--record-type=bibs"|);
113
    }
113
    }
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