From c94fa5aee12cfc67fa2d61f9b93c92453bd4d60b Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 12 Jun 2012 15:16:56 +0000
Subject: [PATCH] BIS-70 SP-112 Include sample parent in the sample updates.
SVN: 25663
---
.../registrator/api/v1/impl/ConversionUtils.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java
index c12adafc293..46bba0b86fd 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
import java.util.Collections;
import java.util.List;
+import java.util.Set;
import ch.systemsx.cisd.common.types.BooleanOrUnknown;
import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationDetails;
@@ -95,6 +96,14 @@ public class ConversionUtils
public static SampleUpdatesDTO convertToSampleUpdateDTO(Sample apiSample)
{
ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample sample = apiSample.getSample();
+ Set<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample> sampleParents =
+ sample.getParents();
+ String[] parentCodes = new String[sampleParents.size()];
+ int i = 0;
+ for (ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample parent : sampleParents)
+ {
+ parentCodes[i++] = parent.getCode();
+ }
List<NewAttachment> attachments = Collections.emptyList();
String containerIdentifier =
@@ -109,7 +118,7 @@ public class ConversionUtils
sample.getModificationDate(), // Sample version
SampleIdentifierFactory.parse(sample.getIdentifier()), // Sample Identifier
containerIdentifier, // Container Identifier
- null // Parent Identifiers
+ parentCodes // Parent Identifiers
);
return sampleUpdate;
}
--
GitLab