From 90af0ce7f2f0a8b4155d65a89e612bea1631db38 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Wed, 23 Feb 2011 19:11:58 +0100
Subject: [PATCH] Multiple Dispatch - one-to-many.

---
 SL/Helper/Csv/Dispatcher.pm | 24 +++++++++++++----
 t/helper/csv.t              | 52 +++++++++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/SL/Helper/Csv/Dispatcher.pm b/SL/Helper/Csv/Dispatcher.pm
index 3b6044342..31c5eba58 100644
--- a/SL/Helper/Csv/Dispatcher.pm
+++ b/SL/Helper/Csv/Dispatcher.pm
@@ -32,11 +32,24 @@ sub apply {
   return unless $value;
 
   for my $step (@{ $spec->{steps} }) {
-    my ($acc, $class) = @$step;
+    my ($acc, $class, $index) = @$step;
     if ($class) {
+
+      # autovifify
       eval "require $class; 1" or die "could not load class '$class'";
-      $obj->$acc($class->new) if ! $obj->$acc;
-      $obj = $obj->$acc;
+      if (defined $index) {
+        if (! $obj->$acc || !$obj->$acc->[$index]) {
+          my @objects = $obj->$acc;
+          $obj->$acc(@objects, map { $class->new } 0 .. $index - @objects);
+        }
+        $obj = $obj->$acc->[$index];
+      } else {
+        if (! $obj->$acc) {
+          $obj->$acc($class->new);
+        }
+        $obj = $obj->$acc;
+      }
+
     } else {
       $obj->$acc($value);
     }
@@ -71,11 +84,12 @@ sub make_spec {
   my $spec = { key => $col, steps => [] };
   my $cur_class = $self->_csv->class;
 
-  for my $step ( split /\./, $path ) {
+  for my $step_index ( split /\.(?!\d)/, $path ) {
+    my ($step, $index) = split /\./, $step_index;
     if ($cur_class->can($step)) {
       if ($cur_class->meta->relationship($step)) { #a
         my $next_class = $cur_class->meta->relationship($step)->class;
-        push @{ $spec->{steps} }, [ $step, $next_class ];
+        push @{ $spec->{steps} }, [ $step, $next_class, $index ];
         $cur_class = $next_class;
       } else { # simple dispatch
         push @{ $spec->{steps} }, [ $step ];
diff --git a/t/helper/csv.t b/t/helper/csv.t
index 58d2d55d9..7ac728f26 100644
--- a/t/helper/csv.t
+++ b/t/helper/csv.t
@@ -1,5 +1,6 @@
-use Test::More;
+use Test::More tests => 29;
 use SL::Dispatcher;
+use Data::Dumper;
 use utf8;
 
 use_ok 'SL::Helper::Csv';
@@ -159,5 +160,52 @@ isa_ok $csv->get_objects->[0]->buchungsgruppe, 'SL::DB::Buchungsgruppe', 'deep d
 is $csv->get_objects->[0]->buchungsgruppe->description, 'Standard 7%', '...and gets set correctly';
 
 
-done_testing();
+#####
+
+$csv = SL::Helper::Csv->new(
+  file   => \<<EOL,
+description;partnumber;sellprice;lastcost_as_number;make_1;model_1;
+  Kaffee;;0.12;1,221.52;213;Chair 0815
+Beer;1123245;0.12;1.5234;
+EOL
+  numberformat => '1,000.00',
+  class  => 'SL::DB::Part',
+  profile => {
+    make_1 => "makemodels.0.make",
+    model_1 => "makemodels.0.model",
+  }
+);
+$csv->parse;
+my @mm = $csv->get_objects->[0]->makemodel;
+is scalar @mm,  1, 'one-to-many dispatch';
+is $csv->get_objects->[0]->makemodels->[0]->model, 'Chair 0815', '... and works';
+
+#####
+
+
+$csv = SL::Helper::Csv->new(
+  file   => \<<EOL,
+description;partnumber;sellprice;lastcost_as_number;make_1;model_1;make_2;model_2;
+ Kaffee;;0.12;1,221.52;213;Chair 0815;523;Table 15
+EOL
+  numberformat => '1,000.00',
+  class  => 'SL::DB::Part',
+  profile => {
+    make_1 => "makemodels.0.make",
+    model_1 => "makemodels.0.model",
+    make_2 => "makemodels.1.make",
+    model_2 => "makemodels.1.model",
+  }
+);
+$csv->parse;
+
+print Dumper($csv->errors);
+
+my @mm = $csv->get_objects->[0]->makemodel;
+is scalar @mm,  1, 'multiple one-to-many dispatch';
+is $csv->get_objects->[0]->makemodels->[0]->model, 'Chair 0815', '...check 1';
+is $csv->get_objects->[0]->makemodels->[0]->make, '213', '...check 2';
+is $csv->get_objects->[0]->makemodels->[1]->model, 'Table 15', '...check 3';
+is $csv->get_objects->[0]->makemodels->[1]->make, '523', '...check 4';
+
 # vim: ft=perl
-- 
2.20.1