X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2Fexport.pl;h=1ed7b1af4efe61e91bc25751631d3dc1a72113a8;hb=b0dc5fc0f32a26c24b6e9da91da6ab2ffda0e2c2;hp=3ef8427c07058fb1b0a362a5ae29da48e9bbc86d;hpb=c8ef17ea3965f04ed3b0bebb85d4c70dd1cfc131;p=koha.git diff --git a/tools/export.pl b/tools/export.pl index 3ef8427c07..1ed7b1af4e 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -3,452 +3,329 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . - -use strict; -use warnings; +use Modern::Perl; +use CGI qw ( -utf8 ); +use MARC::File::XML; +use List::MoreUtils qw(uniq); use C4::Auth; +use C4::Koha; # GetItemTypes use C4::Output; -use C4::Biblio; # GetMarcBiblio GetXmlBiblio -use C4::AuthoritiesMarc; # GetAuthority -use CGI; -use C4::Koha; # GetItemTypes -use C4::Branch; # GetBranches -use C4::Record; -use Getopt::Long; - -my $query = new CGI; - -my $op; -my $filename; -my $dbh = C4::Context->dbh; -my $marcflavour = C4::Context->preference("marcflavour"); -my $clean; -my $output_format; -my $dont_export_items; -my $deleted_barcodes; -my $timestamp; -my $record_type; -my $help; - -# Checks if the script is called from commandline -my $commandline = not defined $ENV{GATEWAY_INTERFACE}; - -if ( $commandline ) { - - # Getting parameters - $op = 'export'; - GetOptions( - 'format=s' => \$output_format, - 'date=s' => \$timestamp, - 'dont_export_items' => \$dont_export_items, - 'deleted_barcodes' => \$deleted_barcodes, - 'clean' => \$clean, - 'filename=s' => \$filename, - 'record-type=s' => \$record_type, - 'help|?' => \$help - ); - - if ($help) { - print <<_USAGE_; -export.pl [--format=format] [--date=date] [--record-type=TYPE] [--dont_export_items] [--deleted_barcodes] [--clean] --filename=outputfile - - - --format=FORMAT FORMAT is either 'xml' or 'marc' (default) - - --date=DATE DATE should be entered as the 'dateformat' syspref is - set (dd/mm/yyyy for metric, yyyy-mm-dd for iso, - mm/dd/yyyy for us) records exported are the ones that - have been modified since DATE - - --record-type=TYPE TYPE is 'bibs' or 'auths' - --deleted_barcodes If used, a list of barcodes of items deleted since DATE - is produced (or from all deleted items if no date is - specified). Used only if TYPE is 'bibs' +use Koha::Authority::Types; +use Koha::Biblioitems; +use Koha::CsvProfiles; +use Koha::Database; +use Koha::DateUtils qw( dt_from_string output_pref ); +use Koha::Exporter::Record; +use Koha::Libraries; - --clean removes NSE/NSB -_USAGE_ - exit; - } - - # Default parameters values : - $output_format ||= 'marc'; - $timestamp ||= ''; - $dont_export_items ||= 0; - $deleted_barcodes ||= 0; - $clean ||= 0; - $record_type ||= "bibs"; - - # Redirect stdout - open STDOUT, '>', $filename if $filename; - -} else { - - $op = $query->param("op") || ''; - $filename = $query->param("filename") || 'koha.mrc'; - $filename =~ s/(\r|\n)//; +my $query = new CGI; +my $dont_export_items = $query->param("dont_export_item") || 0; +my $record_type = $query->param("record_type"); +my $op = $query->param("op") || ''; +my $output_format = $query->param("format") || $query->param("output_format") || 'iso2709'; +my $backupdir = C4::Context->config('backupdir'); +my $filename = $query->param("filename") || ( $output_format eq 'csv' ? 'koha.csv' : 'koha.mrc' ); +$filename =~ s/(\r|\n)//; + +my $dbh = C4::Context->dbh; + +my @record_ids; +# biblionumbers is sent from circulation.pl only +if ( $query->param("biblionumbers") ) { + $record_type = 'bibs'; + @record_ids = $query->multi_param("biblionumbers"); } -my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( +# Default value for output_format is 'iso2709' +$output_format ||= 'iso2709'; +# Retrocompatibility for the format parameter +$output_format = 'iso2709' if $output_format eq 'marc'; + +my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( { - template_name => "tools/export.tmpl", - query => $query, - type => "intranet", - authnotrequired => $commandline, - flagsrequired => {tools => 'export_catalog'}, - debug => 1, + template_name => "tools/export.tt", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => 'export_catalog' }, + debug => 1, } ); -my $limit_ind_branch = ( - C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - !(C4::Context->userenv->{flags} & 1) && - C4::Context->userenv->{branch} -) ? 1 : 0; - -my $branch = $query->param("branch") || ''; -if ( C4::Context->preference("IndependantBranches") && - C4::Context->userenv && - !(C4::Context->userenv->{flags} & 1) ) { - $branch = C4::Context->userenv->{'branch'}; +my @branch = $query->multi_param("branch"); + +my @messages; +if ( $op eq 'export' ) { + my $filename = $query->param('id_list_file'); + if ( $filename ) { + my $mimetype = $query->uploadInfo($filename)->{'Content-Type'}; + my @valid_mimetypes = qw( application/octet-stream text/csv text/plain ); + unless ( grep { /^$mimetype$/ } @valid_mimetypes ) { + push @messages, { type => 'alert', code => 'invalid_mimetype' }; + $op = ''; + } + } } -my $backupdir = C4::Context->config('backupdir'); - -if ($op eq "export") { - my $charset = 'utf-8'; - my $mimetype = 'application/octet-stream'; - binmode STDOUT, ':encoding(UTF-8)'; - if ( $filename =~ m/\.gz$/ ) { - $mimetype = 'application/x-gzip'; - $charset = ''; - binmode STDOUT; - } elsif ( $filename =~ m/\.bz2$/ ) { - $mimetype = 'application/x-bzip2'; - binmode STDOUT; - $charset = ''; - } - print $query->header( - -type => $mimetype, - -charset => $charset, - -attachment => $filename - ) unless ($commandline); - - $record_type = $query->param("record_type") unless ($commandline); - $output_format = $query->param("output_format") || 'marc' unless ($commandline); - my $dont_export_fields = $query->param("dont_export_fields"); +if ( $op eq "export" ) { + + my $export_remove_fields = $query->param("export_remove_fields") || q||; + my @biblionumbers = $query->multi_param("biblionumbers"); + my @itemnumbers = $query->multi_param("itemnumbers"); + my $strip_nonlocal_items = $query->param('strip_nonlocal_items'); my @sql_params; my $sql_query; - my $StartingBiblionumber = $query->param("StartingBiblionumber"); - my $EndingBiblionumber = $query->param("EndingBiblionumber"); - my $itemtype = $query->param("itemtype"); - my $start_callnumber = $query->param("start_callnumber"); - my $end_callnumber = $query->param("end_callnumber"); - $timestamp = ($timestamp) ? C4::Dates->new($timestamp) : '' if ($commandline); - my $start_accession = - ( $query->param("start_accession") ) - ? C4::Dates->new( $query->param("start_accession") ) - : ''; - my $end_accession = - ( $query->param("end_accession") ) - ? C4::Dates->new( $query->param("end_accession") ) - : ''; - $dont_export_items = $query->param("dont_export_item") unless ($commandline); - my $strip_nonlocal_items = $query->param("strip_nonlocal_items"); - - my $biblioitemstable = ($commandline and $deleted_barcodes) - ? 'deletedbiblioitems' - : 'biblioitems'; - my $itemstable = ($commandline and $deleted_barcodes) - ? 'deleteditems' - : 'items'; - - my $starting_authid = $query->param('starting_authid'); - my $ending_authid = $query->param('ending_authid'); - my $authtype = $query->param('authtype'); - - if ( $record_type eq 'bibs' ) { - if ($timestamp) { - # Specific query when timestamp is used - # Actually it's used only with CLI and so all previous filters - # are not used. - # If one day timestamp is used via the web interface, this part will - # certainly have to be rewrited - $sql_query = " ( - SELECT biblionumber - FROM $biblioitemstable - LEFT JOIN items USING(biblionumber) - WHERE $biblioitemstable.timestamp >= ? - OR items.timestamp >= ? - ) UNION ( - SELECT biblionumber - FROM $biblioitemstable - LEFT JOIN deleteditems USING(biblionumber) - WHERE $biblioitemstable.timestamp >= ? - OR deleteditems.timestamp >= ? - ) "; - my $ts = $timestamp->output('iso'); - @sql_params = ($ts, $ts, $ts, $ts); - } else { - my $items_filter = - $branch || $start_callnumber || $end_callnumber || - $start_accession || $timestamp || $end_accession || - ($itemtype && C4::Context->preference('item-level_itypes')); - $sql_query = $items_filter ? - "SELECT DISTINCT $biblioitemstable.biblionumber - FROM $biblioitemstable JOIN $itemstable - USING (biblionumber) WHERE 1" - : - "SELECT $biblioitemstable.biblionumber FROM $biblioitemstable WHERE biblionumber >0 "; - - if ( $StartingBiblionumber ) { - $sql_query .= " AND $biblioitemstable.biblionumber >= ? "; - push @sql_params, $StartingBiblionumber; - } - - if ( $EndingBiblionumber ) { - $sql_query .= " AND $biblioitemstable.biblionumber <= ? "; - push @sql_params, $EndingBiblionumber; - } - - if ($branch) { - $sql_query .= " AND homebranch = ? "; - push @sql_params, $branch; - } - - if ($start_callnumber) { - $sql_query .= " AND itemcallnumber <= ? "; - push @sql_params, $start_callnumber; - } - - if ($end_callnumber) { - $sql_query .= " AND itemcallnumber >= ? "; - push @sql_params, $end_callnumber; - } - if ($start_accession) { - $sql_query .= " AND dateaccessioned >= ? "; - push @sql_params, $start_accession->output('iso'); - } + my $libraries = $strip_nonlocal_items + ? [ Koha::Libraries->find(C4::Context->userenv->{branch})->unblessed ] + : Koha::Libraries->search_filtered->unblessed; + my @branchcodes; + for my $branchcode ( @branch ) { + if ( grep { $_->{branchcode} eq $branchcode } @$libraries ) { + push @branchcodes, $branchcode; + } + } - if ($end_accession) { - $sql_query .= " AND dateaccessioned <= ? "; - push @sql_params, $end_accession->output('iso'); + if ( $record_type eq 'bibs' or $record_type eq 'auths' ) { + # No need to retrieve the record_ids if we already get them + unless ( @record_ids ) { + if ( $record_type eq 'bibs' ) { + my $starting_biblionumber = $query->param("StartingBiblionumber"); + my $ending_biblionumber = $query->param("EndingBiblionumber"); + my $itemtype = $query->param("itemtype"); + my $start_callnumber = $query->param("start_callnumber"); + my $end_callnumber = $query->param("end_callnumber"); + my $start_accession = + ( $query->param("start_accession") ) + ? dt_from_string( scalar $query->param("start_accession") ) + : ''; + my $end_accession = + ( $query->param("end_accession") ) + ? dt_from_string( scalar $query->param("end_accession") ) + : ''; + + + my $conditions = { + ( $starting_biblionumber or $ending_biblionumber ) + ? ( + "me.biblionumber" => { + ( $starting_biblionumber ? ( '>=' => $starting_biblionumber ) : () ), + ( $ending_biblionumber ? ( '<=' => $ending_biblionumber ) : () ), + } + ) + : (), + + ( $start_callnumber or $end_callnumber ) + ? ( + 'items.itemcallnumber' => { + ( $start_callnumber ? ( '>=' => $start_callnumber ) : () ), + ( $end_callnumber ? ( '<=' => $end_callnumber ) : () ), + } + ) + : (), + + ( $start_accession or $end_accession ) + ? ( + 'items.dateaccessioned' => { + ( $start_accession ? ( '>=' => $start_accession ) : () ), + ( $end_accession ? ( '<=' => $end_accession ) : () ), + } + ) + : (), + ( @branchcodes ? ( 'items.homebranch' => { in => \@branchcodes } ) : () ), + ( $itemtype + ? + C4::Context->preference('item-level_itypes') + ? ( 'items.itype' => $itemtype ) + : ( 'me.itemtype' => $itemtype ) + : () + ), + + }; + my $biblioitems = Koha::Biblioitems->search( $conditions, { join => 'items', columns => 'biblionumber' } ); + while ( my $biblioitem = $biblioitems->next ) { + push @record_ids, $biblioitem->biblionumber; + } } - - if ( $itemtype ) { - $sql_query .= (C4::Context->preference('item-level_itypes')) ? " AND items.itype = ? " : " AND biblioitems.itemtype = ?"; - push @sql_params, $itemtype; + elsif ( $record_type eq 'auths' ) { + my $starting_authid = $query->param('starting_authid'); + my $ending_authid = $query->param('ending_authid'); + my $authtype = $query->param('authtype'); + + my $conditions = { + ( $starting_authid or $ending_authid ) + ? ( + authid => { + ( $starting_authid ? ( '>=' => $starting_authid ) : () ), + ( $ending_authid ? ( '<=' => $ending_authid ) : () ), + } + ) + : (), + ( $authtype ? ( authtypecode => $authtype ) : () ), + }; + # Koha::MetadataRecord::Authority is not a Koha::Object... + my $authorities = Koha::Database->new->schema->resultset('AuthHeader')->search( $conditions ); + @record_ids = map { $_->authid } $authorities->all; } } - } - elsif ( $record_type eq 'auths' ) { - $sql_query = - "SELECT DISTINCT auth_header.authid FROM auth_header WHERE 1"; - if ($starting_authid) { - $sql_query .= " AND auth_header.authid >= ? "; - push @sql_params, $starting_authid; + @record_ids = uniq @record_ids; + if ( @record_ids and my $filefh = $query->upload("id_list_file") ) { + my @filter_record_ids = <$filefh>; + @filter_record_ids = map { my $id = $_; $id =~ s/[\r\n]*$//; $id } @filter_record_ids; + # intersection + my %record_ids = map { $_ => 1 } @record_ids; + @record_ids = grep $record_ids{$_}, @filter_record_ids; } - if ($ending_authid) { - $sql_query .= " AND auth_header.authid <= ? "; - push @sql_params, $ending_authid; - } + print CGI->new->header( + -type => 'application/octet-stream', + -charset => 'utf-8', + -attachment => $filename, + ); - if ($authtype) { - $sql_query .= " AND auth_header.authtypecode = ? "; - push @sql_params, $authtype; - } - } - elsif ( $record_type eq 'db' ) { - my $successful_export; - if ( $flags->{superlibrarian} && C4::Context->config('backup_db_via_tools') ) { - $successful_export = download_backup( { directory => "$backupdir", extension => 'sql', filename => "$filename" } ) - } - unless ( $successful_export ) { - my $remotehost = $query->remote_host(); - $remotehost =~ s/(\n|\r)//; - warn "A suspicious attempt was made to download the db at '$filename' by someone at " . $remotehost . "\n"; - } - exit; + my $csv_profile_id = $query->param('csv_profile_id'); + Koha::Exporter::Record::export( + { record_type => $record_type, + record_ids => \@record_ids, + format => $output_format, + filename => $filename, + itemnumbers => \@itemnumbers, + dont_export_fields => $export_remove_fields, + csv_profile_id => $csv_profile_id, + export_items => (not $dont_export_items), + } + ); } - elsif ( $record_type eq 'conf' ) { + elsif ( $record_type eq 'db' or $record_type eq 'conf' ) { my $successful_export; - if ( $flags->{superlibrarian} && C4::Context->config('backup_conf_via_tools') ) { - $successful_export = download_backup( { directory => "$backupdir", extension => 'tar', filename => "$filename" } ) - } - unless ( $successful_export ) { - my $remotehost = $query->remote_host(); - $remotehost =~ s/(\n|\r)//; - warn "A suspicious attempt was made to download the configuration at '$filename' by someone at " . $remotehost . "\n"; - } - exit; - } - else { - # Someone is trying to mess us up - exit; - } - my $sth = $dbh->prepare($sql_query); - $sth->execute(@sql_params); - - while ( my ($recordid) = $sth->fetchrow ) { - if ( $deleted_barcodes ) { - my $q = " - SELECT DISTINCT barcode - FROM deleteditems - WHERE deleteditems.biblionumber = ? - "; - my $sth = $dbh->prepare($q); - $sth->execute($recordid); - while (my $row = $sth->fetchrow_array) { - print "$row\n"; + if ( $flags->{superlibrarian} + and ( + $record_type eq 'db' and C4::Context->config('backup_db_via_tools') + or + $record_type eq 'conf' and C4::Context->config('backup_conf_via_tools') + ) + ) { + binmode STDOUT, ':encoding(UTF-8)'; + + my $charset = 'utf-8'; + my $mimetype = 'application/octet-stream'; + if ( $filename =~ m/\.gz$/ ) { + $mimetype = 'application/x-gzip'; + $charset = ''; + binmode STDOUT; } - } else { - my $record; - if ( $record_type eq 'bibs' ) { - $record = eval { GetMarcBiblio($recordid); }; - - if ($@) { - next; - } - next if not defined $record; - C4::Biblio::EmbedItemsInMarcBiblio( $record, $recordid ) - unless $dont_export_items; - if ( $strip_nonlocal_items || $limit_ind_branch ) { - my ( $homebranchfield, $homebranchsubfield ) = - GetMarcFromKohaField( 'items.homebranch', '' ); - for my $itemfield ( $record->field($homebranchfield) ) { - - # if stripping nonlocal items, use loggedinuser's branch if they didn't select one - $branch = C4::Context->userenv->{'branch'} unless $branch; - $record->delete_field($itemfield) - if ( - $itemfield->subfield($homebranchsubfield) ne $branch ); - } - } - } - elsif ( $record_type eq 'auths' ) { - $record = C4::AuthoritiesMarc::GetAuthority($recordid); - next if not defined $record; + elsif ( $filename =~ m/\.bz2$/ ) { + $mimetype = 'application/x-bzip2'; + binmode STDOUT; + $charset = ''; } + print $query->header( + -type => $mimetype, + -charset => $charset, + -attachment => $filename, + ); - if ( $dont_export_fields ) { - my @fields = split " ", $dont_export_fields; - foreach ( @fields ) { - /^(\d*)(\w)?$/; - my $field = $1; - my $subfield = $2; - # skip if this record doesn't have this field - next if not defined $record->field($field); - if( $subfield ) { - $record->field($field)->delete_subfields($subfield); - } - else { - $record->delete_field($record->field($field)); - } - } - } - RemoveAllNsb($record) if ($clean); - if ( $output_format eq "xml" ) { - if ($marcflavour eq 'UNIMARC' && $record_type eq 'auths') { - print $record->as_xml_record('UNIMARCAUTH'); - } else { - print $record->as_xml_record($marcflavour); + my $extension = $record_type eq 'db' ? 'sql' : 'tar'; + + $successful_export = download_backup( + { + directory => $backupdir, + extension => $extension, + filename => $filename, } - } - else { - print $record->as_usmarc(); + ); + unless ($successful_export) { + my $remotehost = $query->remote_host(); + $remotehost =~ s/(\n|\r)//; + warn + "A suspicious attempt was made to download the " . ( $record_type eq 'db' ? 'db' : 'configuration' ) . "at '$filename' by someone at " + . $remotehost . "\n"; } } } - exit; -} # if export + exit; +} else { my $itemtypes = GetItemTypes; my @itemtypesloop; - foreach my $thisitemtype (sort keys %$itemtypes) { - my %row = - ( - value => $thisitemtype, - description => $itemtypes->{$thisitemtype}->{'description'}, - ); - push @itemtypesloop, \%row; - } - my $branches = GetBranches($limit_ind_branch); - my @branchloop; - for my $thisbranch ( - sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } - keys %{$branches} - ) { - push @branchloop, - { value => $thisbranch, - selected => $thisbranch eq $branch, - branchname => $branches->{$thisbranch}->{'branchname'}, - }; - } - - my $authtypes = getauthtypes; - my @authtypesloop; - foreach my $thisauthtype ( sort keys %$authtypes ) { - next unless $thisauthtype; + foreach my $thisitemtype ( sort keys %$itemtypes ) { my %row = ( - value => $thisauthtype, - description => $authtypes->{$thisauthtype}->{'authtypetext'}, + value => $thisitemtype, + description => $itemtypes->{$thisitemtype}->{translated_description}, ); - push @authtypesloop, \%row; + push @itemtypesloop, \%row; } - if ( $flags->{superlibrarian} && C4::Context->config('backup_db_via_tools') && $backupdir && -d $backupdir ) { + my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypecode'] } ); + + my $libraries = Koha::Libraries->search_filtered({}, { order_by => ['branchname'] })->unblessed; + for my $library ( @$libraries ) { + $library->{selected} = 1 if grep { $library->{branchcode} eq $_ } @branch; + } + + if ( $flags->{superlibrarian} + && C4::Context->config('backup_db_via_tools') + && $backupdir + && -d $backupdir ) + { $template->{VARS}->{'allow_db_export'} = 1; - $template->{VARS}->{'dbfiles'} = getbackupfilelist( { directory => "$backupdir", extension => 'sql' } ); + $template->{VARS}->{'dbfiles'} = getbackupfilelist( + { directory => "$backupdir", extension => 'sql' } ); } - if ( $flags->{superlibrarian} && C4::Context->config('backup_conf_via_tools') && $backupdir && -d $backupdir ) { + if ( $flags->{superlibrarian} + && C4::Context->config('backup_conf_via_tools') + && $backupdir + && -d $backupdir ) + { $template->{VARS}->{'allow_conf_export'} = 1; - $template->{VARS}->{'conffiles'} = getbackupfilelist( { directory => "$backupdir", extension => 'tar' } ); + $template->{VARS}->{'conffiles'} = getbackupfilelist( + { directory => "$backupdir", extension => 'tar' } ); } $template->param( - branchloop => \@branchloop, + libraries => $libraries, itemtypeloop => \@itemtypesloop, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), - authtypeloop => \@authtypesloop, - dont_export_fields => C4::Context->preference("DontExportFields"), + authority_types => $authority_types, + export_remove_fields => C4::Context->preference("ExportRemoveFields"), + csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ], + messages => \@messages, ); output_html_with_http_headers $query, $cookie, $template->output; } sub getbackupfilelist { - my $args = shift; + my $args = shift; my $directory = $args->{directory}; my $extension = $args->{extension}; my @files; - if ( opendir(my $dir, $directory) ) { - while (my $file = readdir($dir)) { + if ( opendir( my $dir, $directory ) ) { + while ( my $file = readdir($dir) ) { next unless ( $file =~ m/\.$extension(\.(gz|bz2|xz))?/ ); - push @files, $file if ( -f "$directory/$file" && -r "$directory/$file" ); + push @files, $file + if ( -f "$directory/$file" && -r "$directory/$file" ); } closedir($dir); } @@ -456,7 +333,7 @@ sub getbackupfilelist { } sub download_backup { - my $args = shift; + my $args = shift; my $directory = $args->{directory}; my $extension = $args->{extension}; my $filename = $args->{filename}; @@ -466,11 +343,12 @@ sub download_backup { return if ( $filename =~ m#/# ); $filename = "$directory/$filename"; return unless ( -f $filename && -r $filename ); - return unless ( open(my $dump, '<', $filename) ); + return unless ( open( my $dump, '<', $filename ) ); binmode $dump; - while (read($dump, my $data, 64 * 1024)) { + + while ( read( $dump, my $data, 64 * 1024 ) ) { print $data; } - close ($dump); + close($dump); return 1; }