From 6b3287ffd5d6c2c7d927febf3a9ad35793b4b45b Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Tue, 9 Jan 2018 14:37:08 +0000 Subject: [PATCH] Bug 19937: Silence warnings t/db_dependent/www/batch.t TEST PLAN --------- 1) Run the following on a kohadevbox: git checkout -b bug_19937 origin/master sudo koha-shell -c bash kohadev prove t/db_dependent/www/batch.t cat /var/log/koha/kohadev/plack-error.log The following errors are triggered at the end of the log file: Use of uninitialized value in array element at /home/vagrant/kohaclone/tools/batch_records_ajax.pl line 50. Use of uninitialized value $results_per_page in numeric eq (==) at /home/vagrant/kohaclone/tools/batch_records_ajax.pl line 53. Use of uninitialized value in uc at /home/vagrant/kohaclone/C4/ImportBatch.pm line 1120. 2) Run the following on a kohadevbox: exit git bz apply 19937 restart_all sudo koha-shell -c bash kohadev prove t/db_dependent/www/batch.t cat /var/log/koha/kohadev/plack-error.log The log file will end with the restarting of plack, not the errors. 3) run koha qa test tools Signed-off-by: Lee Jamison Signed-off-by: Marcel de Rooy Amended handling of $results_per_page. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 1107590df2a7fab465225c683a3ba62b7796584c) Signed-off-by: Fridolin Somers --- C4/ImportBatch.pm | 2 +- tools/batch_records_ajax.pl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index 62b04bd3dc..9da82554b5 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -1118,7 +1118,7 @@ sub GetImportRecordsRange { ( $order_by ) = grep( /^$order_by$/, qw( import_record_id title status overlay_status ) ) ? $order_by : 'import_record_id'; my $order_by_direction = - uc( $parameters->{order_by_direction} ) eq 'DESC' ? 'DESC' : 'ASC'; + uc( $parameters->{order_by_direction} // 'ASC' ) eq 'DESC' ? 'DESC' : 'ASC'; $order_by .= " $order_by_direction, authorized_heading" if $order_by eq 'title'; diff --git a/tools/batch_records_ajax.pl b/tools/batch_records_ajax.pl index c8c61989f0..349d858a25 100755 --- a/tools/batch_records_ajax.pl +++ b/tools/batch_records_ajax.pl @@ -47,10 +47,10 @@ my @sort_columns = my $import_batch_id = $input->param('import_batch_id'); my $offset = $input->param('iDisplayStart'); my $results_per_page = $input->param('iDisplayLength'); -my $sorting_column = $sort_columns[ $input->param('iSortCol_0') ]; +my $sorting_column = $sort_columns[ $input->param('iSortCol_0') // 0 ]; my $sorting_direction = $input->param('sSortDir_0'); -$results_per_page = undef if ( $results_per_page == -1 ); +$results_per_page = undef if $results_per_page && $results_per_page == -1; binmode STDOUT, ":encoding(UTF-8)"; print $input->header( -type => 'text/plain', -charset => 'UTF-8' ); -- 2.39.5