From 79a37597a117c0f8d06ffaa88f02a0d555706747 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 20 Mar 2013 12:42:24 +0000
Subject: [PATCH] BIS-89 / SP-158: Sample Batch Registration can not handle
samples from different Spaces
SVN: 28655
---
.../shared/parser/SampleUploadSectionsParser.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
index 686366e6336..06dc2fcd9e2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
@@ -298,7 +298,14 @@ public class SampleUploadSectionsParser
List<String> codes = sampleCodeGenerator.generateCodes(newSamples.size());
for (int i = 0; i < newSamples.size(); i++)
{
- newSamples.get(i).setIdentifier(defaultGroupIdentifier + "/" + codes.get(i));
+ if (newSamples.get(i).getDefaultSpaceIdentifier() == null || newSamples.get(i).getDefaultSpaceIdentifier().isEmpty())
+ {
+ newSamples.get(i).setIdentifier(defaultGroupIdentifier + "/" + codes.get(i));
+ } else
+ {
+ newSamples.get(i).setIdentifier(
+ newSamples.get(i).getDefaultSpaceIdentifier() + "/" + codes.get(i));
+ }
}
}
}
--
GitLab