Skip to content

Commit 98c32c6

Browse files
committed
ext-id handling fix
1 parent a61269f commit 98c32c6

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

src/AbraFlexi/RO.php

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,14 +1086,23 @@ public function fixRecordTypes(array $record, $evidence = null)
10861086
if (\is_array($record[$column])) {
10871087
$value = $record[$column][0];
10881088

1089-
$valueFields = array_keys($value);
1090-
$subject = next($valueFields);
1091-
$record[$column] = new Relation(
1092-
\is_array($value) ? ($value['kod'] ?: $value['id']) : $value,
1093-
\array_key_exists('fkEvidencePath', $columnInfo) && null !== $columnInfo['fkEvidencePath'] ? $columnInfo['fkEvidencePath'] : $column,
1094-
\array_key_exists($subject.'@ref', $value) ? $record[$subject.'@ref'] : $value['id'],
1095-
\array_key_exists($subject.'@showAs', $value) ? $value[$subject.'@showAs'] : null,
1096-
);
1089+
if (\is_array($value)) {
1090+
$valueFields = array_keys($value);
1091+
$subject = next($valueFields);
1092+
$record[$column] = new Relation(
1093+
\is_array($value) ? ($value['kod'] ?: $value['id']) : $value,
1094+
\array_key_exists('fkEvidencePath', $columnInfo) && null !== $columnInfo['fkEvidencePath'] ? $columnInfo['fkEvidencePath'] : $column,
1095+
\array_key_exists($subject.'@ref', $value) ? $record[$subject.'@ref'] : $value['id'],
1096+
\array_key_exists($subject.'@showAs', $value) ? $value[$subject.'@showAs'] : null,
1097+
);
1098+
} else {
1099+
$record[$column] = new Relation(
1100+
$value,
1101+
$column,
1102+
str_replace('ext:', '', $value),
1103+
$value,
1104+
);
1105+
}
10971106
} else {
10981107
$record[$column] = new Relation(
10991108
\is_array($value) ? $value[0] : $value,

0 commit comments

Comments
 (0)