Issue #60

Modify key for repeatable items

Author: Ralf Hartung

src/EDI/Interpreter.php

@@ -250,8 +250,6 @@ private function processSegment($segment, &$xmlMap, $segmentIdx, &$errors = null
             $attributes = $xmlMap[$id]['attributes'];
             $details_desc = $xmlMap[$id]['details'];
 
-            $entryCount = [];
-
             $jsonelements = ["segmentIdx" => $segmentIdx, "segmentCode" => $id];
             foreach ($segment as $idx => $detail) {
                 $n = $idx - 1;
@@ -271,12 +269,6 @@ private function processSegment($segment, &$xmlMap, $segmentIdx, &$errors = null
 
                 $d_desc_attr = $details_desc[$n]['attributes'];
 
-                if (!array_key_exists($d_desc_attr['name'], $entryCount)) {
-                    $entryCount[$d_desc_attr['name']] = 0;
-                }
-
-                $entryCount[$d_desc_attr['name']]++;
-
                 $jsoncomposite = [];
                 if (isset($details_desc[$n]['details']) && $detail !== '') {
                     $sub_details_desc = $details_desc[$n]['details'];
@@ -309,15 +301,12 @@ private function processSegment($segment, &$xmlMap, $segmentIdx, &$errors = null
                     $jsoncomposite = $detail;
                 }
 
-                if ($entryCount[$d_desc_attr['name']] === 1) {
-                    $jsonelements[$d_desc_attr['name']] = $jsoncomposite;
+                if (array_key_exists($d_desc_attr['name'], $jsonelements)) {
+                    $jsonelements[$d_desc_attr['name'].$n] = $jsoncomposite;
                 } else {
-                    if ($entryCount[$d_desc_attr['name']] === 2) {
-                        $jsonelements[$d_desc_attr['name']] = [$jsonelements[$d_desc_attr['name']]];
-                    }
-
-                    $jsonelements[$d_desc_attr['name']][] = $jsoncomposite;
+                    $jsonelements[$d_desc_attr['name']] = $jsoncomposite;
                 }
+
             }
             $jsonsegment['key'] = $attributes['name'];
             $jsonsegment['value'] = $jsonelements;