Bugfix: Kein newline am Ende der Datei verschluckte die letzte Zeile.

diff --git a/SL/Helper/Csv.pm b/SL/Helper/Csv.pm
index d4a0c8883b6ff91de1c156f22258b0da15dfb70f..e2032ea277546a05c5fb854b939a3a2b5771fc54 100644 (file)
--- a/SL/Helper/Csv.pm
+++ b/SL/Helper/Csv.pm
@@ -120,18 +120,19 @@ sub _parse_data {
 
   while (1) {
     my $row = $self->_csv->getline($self->_io);
 
   while (1) {
     my $row = $self->_csv->getline($self->_io);

-    last if $self->_csv->eof;

     if ($row) {
       my %hr;
       @hr{@{ $self->header }} = @$row;
       push @data, \%hr;
     } else {
     if ($row) {
       my %hr;
       @hr{@{ $self->header }} = @$row;
       push @data, \%hr;
     } else {

+      last if $self->_csv->eof;

       push @errors, [
         $self->_csv->error_input,
         $self->_csv->error_diag,
         $self->_io->input_line_number,
       ];
     }
       push @errors, [
         $self->_csv->error_input,
         $self->_csv->error_diag,
         $self->_io->input_line_number,
       ];
     }

+    last if $self->_csv->eof;

   }
 
   $self->_data(\@data);
   }
 
   $self->_data(\@data);

diff --git a/t/helper/csv.t b/t/helper/csv.t
index e54dcb6fc2a4659e2ec52856483c5714ff25b5fd..d4a1571995aabdc50572f3ea91fb6d9e5bf5c2f5 100644 (file)
--- a/t/helper/csv.t
+++ b/t/helper/csv.t
@@ -1,4 +1,4 @@
-use Test::More tests => 36;
+use Test::More tests => 37;

 use SL::Dispatcher;
 use Data::Dumper;
 use utf8;
 use SL::Dispatcher;
 use Data::Dumper;
 use utf8;


@@ -264,5 +264,14 @@ $csv->parse;
 
 is_deeply( ($csv->errors)[0], [ 'description', undef, 'header field \'description\' is not recognized', undef, 0 ], 'strict_profile without ignore_columns throws error');
 
 
 is_deeply( ($csv->errors)[0], [ 'description', undef, 'header field \'description\' is not recognized', undef, 0 ], 'strict_profile without ignore_columns throws error');
 

+#####
+
+$csv = SL::Helper::Csv->new(
+  file   => \"Kaffee",
+  header => [ 'description' ],
+  class  => 'SL::DB::Part',
+);
+$csv->parse;
+is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'eol bug at the end of files';

 
 # vim: ft=perl
 
 # vim: ft=perl