From b406013f8aad461f9b0b1771e7ea94bc8fdbcf28 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Wed, 15 May 2024 15:20:26 +0200
Subject: [PATCH] BIS-1058: XLS Import - Regression from changing how variable
substitution for samples work
---
.../server/xls/importer/delay/DelayedExecutionDecorator.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java
index 4d64ce23625..b67fb2fb565 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java
@@ -480,6 +480,11 @@ public class DelayedExecutionDecorator
public void createSample(String variable, SampleCreation sampleCreation, int page, int line)
{
ISampleId sampleId = ImportUtils.buildSampleIdentifier(variable, sampleCreation);
+ if (sampleId instanceof IdentifierVariable && variable == null)
+ {
+ variable = ((IdentifierVariable) sampleId).getVariable();
+ }
+
List<IObjectId> dependencies = new ArrayList<>();
ISpaceId spaceId = sampleCreation.getSpaceId();
--
GitLab