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

(-)a/Koha/Exporter/Record.pm (-12 / +15 lines)
Lines 29-39 sub _get_record_for_export { Link Here
29
        $record = _get_authority_for_export( { %$params, authid => $record_id } );
29
        $record = _get_authority_for_export( { %$params, authid => $record_id } );
30
    } elsif ( $record_type eq 'bibs' ) {
30
    } elsif ( $record_type eq 'bibs' ) {
31
        $record = _get_biblio_for_export( { %$params, biblionumber => $record_id } );
31
        $record = _get_biblio_for_export( { %$params, biblionumber => $record_id } );
32
    } elsif ( $record_type eq 'deleted_bibs' ) {
33
        $record = _get_deleted_biblio_for_export( { %$params, biblionumber => $record_id } );
32
    } else {
34
    } else {
33
        Koha::Logger->get->warn( "Record_type $record_type not supported." );
35
        Koha::Logger->get->warn( "Record type $record_type not supported." );
34
    }
36
    }
35
    if ( !$record ) {
37
    if ( !$record ) {
36
        Koha::Logger->get->warn( "Record $record_id could not be exported." );
38
        Koha::Logger->get->warn( "Record $record_id with record type $record_type could not be exported." );
37
        return;
39
        return;
38
    }
40
    }
39
41
Lines 115-122 sub _get_deleted_biblio_for_export { Link Here
115
    my $biblionumber = $params->{biblionumber};
117
    my $biblionumber = $params->{biblionumber};
116
    # Creating schema is expensive, allow caller to
118
    # Creating schema is expensive, allow caller to
117
    # pass it so don't have to recreate for each call
119
    # pass it so don't have to recreate for each call
118
    my $resultset = $params->{resultset} || Koha::Database
120
    my $resultset = $params->{resultset} || Koha::Database->new()
119
        ->new()
120
        ->schema()
121
        ->schema()
121
        ->resultset('DeletedbiblioMetadata');
122
        ->resultset('DeletedbiblioMetadata');
122
    my $marc_flavour = C4::Context->preference('marcflavour');
123
    my $marc_flavour = C4::Context->preference('marcflavour');
Lines 205-211 sub export { Link Here
205
        Koha::Logger->get->warn( "No record_type given." );
206
        Koha::Logger->get->warn( "No record_type given." );
206
        return;
207
        return;
207
    }
208
    }
208
    return unless (@{$record_ids} || @{$deleted_record_ids} && $format ne 'csv');
209
    return unless @{$record_ids} || @{$deleted_record_ids} && $format ne 'csv';
209
210
210
    my $fh;
211
    my $fh;
211
    if ( $output_filepath ) {
212
    if ( $output_filepath ) {
Lines 225-238 sub export { Link Here
225
226
226
        my @deleted_records;
227
        my @deleted_records;
227
        if (@{$deleted_record_ids}) {
228
        if (@{$deleted_record_ids}) {
228
            my $resultset = Koha::Database
229
            my $resultset = Koha::Database->new()
229
            ->new()
230
                ->schema()
230
            ->schema()
231
                ->resultset('DeletedbiblioMetadata');
231
            ->resultset('DeletedbiblioMetadata');
232
232
            @deleted_records = map {
233
            @deleted_records = map {
233
                my $record = _get_deleted_biblio_for_export({
234
                my $record = _get_record_for_export({
234
                    biblionumber => $_,
235
                    %{$params},
235
                    resultset => $resultset,
236
                    record_type => 'deleted_bibs',
237
                    record_id => $_,
238
                    resultset => $resultset
236
                });
239
                });
237
                $record ? $record : ();
240
                $record ? $record : ();
238
            } @{$deleted_record_ids};
241
            } @{$deleted_record_ids};
(-)a/misc/export_records.pl (-2 / +4 lines)
Lines 97-108 $record_type ||= 'bibs'; Link Here
97
$output_format = 'iso2709' if $output_format eq 'marc';
97
$output_format = 'iso2709' if $output_format eq 'marc';
98
98
99
if ($include_deleted || $deleted_only) {
99
if ($include_deleted || $deleted_only) {
100
   if ($record_type ne 'bibs') {
100
    if ($record_type ne 'bibs') {
101
        pod2usage(q|Option "--include_deleted" or "--deleted_only" can only be used with "--record-type=bibs"|);
101
        pod2usage(q|Option "--include_deleted" or "--deleted_only" can only be used with "--record-type=bibs"|);
102
    }
102
    }
103
    if ($output_format eq 'csv') {
103
    if ($output_format eq 'csv') {
104
        pod2usage(q|Option "--include_deleted" or "--deleted_only" cannot be used with "--format=csv"|);
104
        pod2usage(q|Option "--include_deleted" or "--deleted_only" cannot be used with "--format=csv"|);
105
    }
105
    }
106
    if (!$timestamp) {
107
        pod2usage(q|Option "--include_deleted" or "--deleted_only" must be combined with "--date"|);
108
    }
106
}
109
}
107
110
108
if ( $output_format eq 'csv' and $record_type eq 'auths' ) {
111
if ( $output_format eq 'csv' and $record_type eq 'auths' ) {
109
- 

Return to bug 20551