From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 9 Jun 2021 11:03:20 +0000 (+0200)
Subject: CSV-Helper: Vergessenes Feld "raw_input" bei einigen Fehlermeldungen übergeben …
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~186
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=be076f02fed09b50c15c8ee8d0585542bd55347d;p=kivitendo-erp.git

CSV-Helper: Vergessenes Feld "raw_input" bei einigen Fehlermeldungen übergeben …

… Auch, wenn es undefniert ist, aber sonst stimmen die Felder nicht bei
der Fehlerausgabe.
---

diff --git a/SL/Helper/Csv.pm b/SL/Helper/Csv.pm
index e9fd45c6a..0d471eb09 100644
--- a/SL/Helper/Csv.pm
+++ b/SL/Helper/Csv.pm
@@ -114,6 +114,7 @@ sub _check_multiplexed {
       # Each profile needs a class and a row_ident
       my $info_ok = all { defined $_->{class} && defined $_->{row_ident} } @profile;
       $self->_push_error([
+        undef,
         0,
         "missing class or row_ident in one of the profiles for multiplexed data",
         0,
@@ -125,6 +126,7 @@ sub _check_multiplexed {
         my @header = @{ $self->header };
         my $t_ok = scalar @profile == scalar @header;
         $self->_push_error([
+          undef,
           0,
           "number of headers and number of profiles must be the same for multiplexed data",
           0,
@@ -133,6 +135,7 @@ sub _check_multiplexed {
 
         $t_ok = all { scalar @$_ > 0} @header;
         $self->_push_error([
+          undef,
           0,
           "no empty headers are allowed for multiplexed data",
           0,
@@ -231,7 +234,8 @@ sub _check_multiplex_datatype_position {
     $self->_multiplex_datatype_position($first_pos);
     return 1;
   } else {
-    $self->_push_error([0,
+    $self->_push_error([undef,
+                        0,
                         "datatype field must be at the same position for all datatypes for multiplexed data",
                         0,
                         0]);
@@ -254,6 +258,7 @@ sub _parse_data {
       my $header = $self->_header_by_row($row);
       if (!$header) {
         push @errors, [
+          undef,
           0,
           "Cannot get header for row. Maybe row name and datatype field not matching.",
           0,
diff --git a/t/helper/csv.t b/t/helper/csv.t
index 13bcba7c7..95ca14b36 100644
--- a/t/helper/csv.t
+++ b/t/helper/csv.t
@@ -629,7 +629,7 @@ EOL
   ignore_unknown_columns => 1,
 );
 ok !$csv->parse, 'multiplex check detects incosistent datatype field position';
-is_deeply( ($csv->errors)[0], [ 0, 'datatype field must be at the same position for all datatypes for multiplexed data', 0, 0 ], 'multiplex data with inconsistent datatype field posiotion throws error');
+is_deeply( ($csv->errors)[0], [ undef, 0, 'datatype field must be at the same position for all datatypes for multiplexed data', 0, 0 ], 'multiplex data with inconsistent datatype field posiotion throws error');
 
 #####