LMS-835 ExternalData extend with attribute 'measured' which is used to determine SourceType

SVN: 10635

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java

@@ -383,7 +383,8 @@ public class ETLService extends AbstractServer<IETLService> implements IETLServi
         sampleBO.loadBySampleIdentifier(sampleIdentifier);
         final SamplePE cellPlate = sampleBO.getSample();
         final IExternalDataBO externalDataBO = boFactory.createExternalDataBO(session);
-        externalDataBO.define(externalData, cellPlate, SourceType.MEASUREMENT);
+        SourceType sourceType = externalData.isMeasured() ? SourceType.MEASUREMENT : SourceType.DERIVED;
+        externalDataBO.define(externalData, cellPlate, sourceType);
         externalDataBO.save();
         final String dataSetCode = externalDataBO.getExternalData().getCode();
         assert dataSetCode != null : "Data set code not specified.";

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalData.java

@@ -49,6 +49,8 @@ public final class ExternalData extends ExtractableData
     private BooleanOrUnknown complete = BooleanOrUnknown.U;
 
     private String associatedSampleCode;
+    
+    private boolean measured;
 
     /** Returns <code>dataSetType</code>. */
     public final DataSetType getDataSetType()
@@ -157,6 +159,16 @@ public final class ExternalData extends ExtractableData
         this.associatedSampleCode = sampleCode;
     }
 
+    public final boolean isMeasured()
+    {
+        return measured;
+    }
+    
+    public final void setMeasured(boolean measured)
+    {
+        this.measured = measured;
+    }
+    
     //
     // Object
     //