Case insensitive header waren nicht voll abgedeckt, und haben Fehler bei kaputten...

diff --git a/SL/Helper/Csv.pm b/SL/Helper/Csv.pm
index a30122e04ca835c61df86ae3571733d233f8c6fb..3132b284699a3e4b756bc9386dad1a48e65ee784 100644 (file)
--- a/SL/Helper/Csv.pm
+++ b/SL/Helper/Csv.pm
@@ -99,17 +99,20 @@ sub _open_file {
 
 sub _check_header {
   my ($self, %params) = @_;
 
 sub _check_header {
   my ($self, %params) = @_;

-  return $self->header if $self->header;
+  my $header = $self->header;

 
 

-  my $header = $self->_csv->getline($self->_io);
+  if (! $header) {
+    $header = $self->_csv->getline($self->_io);

 
 

-  $self->_push_error([
-    $self->_csv->error_input,
-    $self->_csv->error_diag,
-    0,
-  ]) unless $header;
+    $self->_push_error([
+      $self->_csv->error_input,
+      $self->_csv->error_diag,
+      0,
+    ]) unless $header;
+  }

 
 

-  $self->header([ map { lc } @{ $header } ]);
+  return unless $header;
+  return $self->header([ map { lc } @$header ]);

 }
 
 sub _parse_data {
 }
 
 sub _parse_data {

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

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


@@ -274,4 +274,23 @@ $csv = SL::Helper::Csv->new(
 $csv->parse;
 is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'eol bug at the end of files';
 
 $csv->parse;
 is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'eol bug at the end of files';
 

+#####
+
+$csv = SL::Helper::Csv->new(
+  file   => \"Description\nKaffee",
+  class  => 'SL::DB::Part',
+);
+$csv->parse;
+is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'case insensitive header from csv works';
+
+#####
+
+$csv = SL::Helper::Csv->new(
+  file   => \"Kaffee",
+  header => [ 'Description' ],
+  class  => 'SL::DB::Part',
+);
+$csv->parse;
+is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'case insensitive header as param works';
+

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