Csv: wantarray syntax entfernt.

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index c94f1bac3337ce364d3fa49775debcf2537786fb..97126979053938ef43f41ee43bb1b37a8f5ddfcb 100644 (file)
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -59,7 +59,7 @@ sub run {
   $self->controller->raw_data_headers({ used => { }, headers => [ ] });
   $self->controller->info_headers({ used => { }, headers => [ ] });
 
   $self->controller->raw_data_headers({ used => { }, headers => [ ] });
   $self->controller->info_headers({ used => { }, headers => [ ] });
 

-  my @objects  = $self->csv->get_objects;
+  my $objects  = $self->csv->get_objects;

 
   $self->controller->track_progress(progress => 70);
 
 
   $self->controller->track_progress(progress => 70);
 


@@ -67,7 +67,7 @@ sub run {
 
   $self->controller->track_progress(progress => 80);
 
 
   $self->controller->track_progress(progress => 80);
 

-  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @objects, @raw_data ]);
+  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @$objects, @raw_data ]);

 
   $self->controller->track_progress(progress => 90);
 
 
   $self->controller->track_progress(progress => 90);
 

diff --git a/SL/Controller/CsvImport/BaseMulti.pm b/SL/Controller/CsvImport/BaseMulti.pm
index 7650938e0b3596213c31a1d9c6d1af1480c56b4b..973a4ae8e93fe6f8a0673e4c004301585670eace 100644 (file)
--- a/SL/Controller/CsvImport/BaseMulti.pm
+++ b/SL/Controller/CsvImport/BaseMulti.pm
@@ -70,7 +70,7 @@ sub run {
   $self->controller->raw_data_headers($raw_data_headers);
   $self->controller->info_headers($info_headers);
 
   $self->controller->raw_data_headers($raw_data_headers);
   $self->controller->info_headers($info_headers);
 

-  my @objects  = $self->csv->get_objects;
+  my $objects  = $self->csv->get_objects;

 
   $self->controller->track_progress(progress => 70);
 
 
   $self->controller->track_progress(progress => 70);
 


@@ -78,7 +78,7 @@ sub run {
 
   $self->controller->track_progress(progress => 80);
 
 
   $self->controller->track_progress(progress => 80);
 

-  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @objects, @raw_data ]);
+  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @$objects, @raw_data ]);

 
   $self->controller->track_progress(progress => 90);
 
 
   $self->controller->track_progress(progress => 90);
 

diff --git a/SL/Helper/Csv.pm b/SL/Helper/Csv.pm
index c4a8aefa204b597a379d2ea54dfbb523658d7ad0..88e61cb63a94723e1236c54935ef8c733af03fae 100644 (file)
--- a/SL/Helper/Csv.pm
+++ b/SL/Helper/Csv.pm
@@ -77,7 +77,7 @@ sub get_objects {
   croak 'must parse first' unless $self->_parsed;
 
   $self->_make_objects unless $self->_objects;
   croak 'must parse first' unless $self->_parsed;
 
   $self->_make_objects unless $self->_objects;

-  return wantarray ? @{ $self->_objects } : $self->_objects;
+  return $self->_objects;

 }
 
 sub errors {
 }
 
 sub errors {


@@ -360,7 +360,7 @@ SL::Helper::Csv - take care of csv file uploads
 
   my $status  = $csv->parse;
   my $hrefs   = $csv->get_data;
 
   my $status  = $csv->parse;
   my $hrefs   = $csv->get_data;

-  my @objects = $csv->get_objects;
+  my $objects = $csv->get_objects;

 
   my @errors  = $csv->errors;
 
 
   my @errors  = $csv->errors;
 


@@ -421,7 +421,7 @@ Do the actual work. Will return true ($self actually) if success, undef if not.
 
 Parse the data into objects and return those.
 
 
 Parse the data into objects and return those.
 

-This method will return list or arrayref depending on context.
+This method will return an arrayref of all objects.

 
 =item C<get_data>
 
 
 =item C<get_data>