From de4b1e970660f9ab8ef22e357cc87639cb9be85e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Mon, 21 Jan 2013 16:19:16 +0100 Subject: [PATCH] =?utf8?q?case=5Finsensitive-Flag=20f=C3=BCr=20Multiplex-D?= =?utf8?q?aten=20anpassen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Helper/Csv.pm | 24 ++++++--- t/helper/csv.t | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 7 deletions(-) diff --git a/SL/Helper/Csv.pm b/SL/Helper/Csv.pm index e457452ba..d0399e0e9 100644 --- a/SL/Helper/Csv.pm +++ b/SL/Helper/Csv.pm @@ -169,12 +169,18 @@ sub _check_header { # mopst likely meant that field, so rewrite the header if ($self->case_insensitive_header) { die 'case_insensitive_header is only possible with profile' unless $self->profile; - my @names = ( - keys %{ $self->profile || {} }, - ); - for my $name (@names) { - for my $i (0..$#$header) { - $header->[$i] = $name if lc $header->[$i] eq lc $name; + if ($header) { + my $p_num = 0; + foreach my $h (@{ $header }) { + my @names = ( + keys %{ $self->profile->[$p_num]->{profile} || {} }, + ); + for my $name (@names) { + for my $i (0..$#$h) { + $h->[$i] = $name if lc $h->[$i] eq lc $name; + } + } + $p_num++; } } } @@ -448,6 +454,12 @@ these information are unique, and should be connected to preexisting data, you will have to do that for yourself. Since you provided the profile, it is assumed you know what to do in this case. +If no profile is given, any header field found will be taken as is. + +If the path in a profile entry is empty, the field will be subjected to +C and C checking, will be parsed into +C, but will not be attempted to be dispatched into objects. + If C is present, the line will be handed to the new sub of this class, and the return value used instead of the line itself. diff --git a/t/helper/csv.t b/t/helper/csv.t index b9785000d..30a3c3a37 100644 --- a/t/helper/csv.t +++ b/t/helper/csv.t @@ -1,4 +1,4 @@ -use Test::More tests => 64; +use Test::More tests => 71; use lib 't'; use utf8; @@ -549,6 +549,133 @@ EOL ); ok !$csv->_check_multiplexed, 'multiplex check detects empty header'; +##### + +$csv = SL::Helper::Csv->new( + file => \"Datatype;Description\nDatatype;Name\nP;Kaffee\nC;Meier", # " # make emacs happy + case_insensitive_header => 1, + ignore_unknown_columns => 1, + profile => [ + { + profile => { datatype => 'datatype', description => 'description' }, + class => 'SL::DB::Part', + row_ident => 'P' + }, + { + profile => { datatype => 'datatype', name => 'name' }, + class => 'SL::DB::Customer', + row_ident => 'C' + } + ], +); +$csv->parse; +is_deeply $csv->get_data, [ { datatype => 'P', description => 'Kaffee' }, + { datatype => 'C', name => 'Meier'} ], + 'multiplex: case insensitive header from csv works'; + +##### + +$csv = SL::Helper::Csv->new( + file => \"P;Kaffee\nC;Meier", # " # make emacs happy + header => [[ 'Datatype', 'Description' ], [ 'Datatype', 'Name']], + case_insensitive_header => 1, + profile => [ + { + profile => { datatype => 'datatype', description => 'description' }, + class => 'SL::DB::Part', + row_ident => 'P' + }, + { + profile => { datatype => 'datatype', name => 'name' }, + class => 'SL::DB::Customer', + row_ident => 'C' + } + ], +); +$csv->parse; +is_deeply $csv->get_data, [ { datatype => 'P', description => 'Kaffee' }, + { datatype => 'C', name => 'Meier' } ], + 'multiplex: case insensitive header as param works'; + + +##### + +$csv = SL::Helper::Csv->new( + file => \"P;Kaffee\nC;Meier", # " # make emacs happy + header => [[ 'Datatype', 'Description' ], [ 'Datatype', 'Name']], + profile => [ + { + profile => { datatype => 'datatype', description => 'description' }, + class => 'SL::DB::Part', + row_ident => 'P' + }, + { + profile => { datatype => 'datatype', name => 'name' }, + class => 'SL::DB::Customer', + row_ident => 'C' + } + ], +); +$csv->parse; +is_deeply $csv->get_data, undef, 'multiplex: case insensitive header without flag ignores'; + +##### + +$csv = SL::Helper::Csv->new( + file => \< [[ 'datatype', 'Afoo', 'Abar' ], [ 'datatype', 'Bfoo', 'Bbar']], + profile => [{ + profile => { datatype => '', Afoo => '', Abar => '' }, + class => 'SL::DB::Part', + row_ident => 'P' + }, + { + profile => { datatype => '', Bfoo => '', Bbar => '' }, + class => 'SL::DB::Customer', + row_ident => 'C' + }], +); +$csv->parse; + +is_deeply $csv->get_data, + [ { datatype => 'P', Afoo => 'Kaffee', Abar => 'lecker' }, { datatype => 'C', Bfoo => 'Meier', Bbar => 'froh' } ], + 'multiplex: empty path still gets parsed into data'; +ok $csv->get_objects->[0], 'multiplex: empty path gets ignored in object creation'; + +##### + +$csv = SL::Helper::Csv->new( + file => \< [[ 'datatype', 'Afoo', 'Abar' ], [ 'datatype', 'Bfoo', 'Bbar']], + strict_profile => 1, + profile => [{ + profile => { datatype => '', Afoo => '', Abar => '' }, + class => 'SL::DB::Part', + row_ident => 'P' + }, + { + profile => { datatype => '', Bfoo => '', Bbar => '' }, + class => 'SL::DB::Customer', + row_ident => 'C' + }], +); +$csv->parse; + +is_deeply $csv->get_data, + [ { datatype => 'P', Afoo => 'Kaffee', Abar => 'lecker' }, { datatype => 'C', Bfoo => 'Meier', Bbar => 'froh' } ], + 'multiplex: empty path still gets parsed into data (strict profile)'; +ok $csv->get_objects->[0], 'multiplex: empty path gets ignored in object creation (strict profile)'; + +##### + # vim: ft=perl # set emacs to perl mode -- 2.20.1