diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java
index dcd9214a02b8d8247ac7a3477d51e1a61b5edd02..af71ac31a8d92c517a07d7ebb4caa671923924b3 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java
@@ -238,7 +238,7 @@ public class PhosphoNetXClientService extends AbstractClientService implements
public void processRawData(String dataSetProcessingKey, long[] rawDataSampleIDs)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
- rawDataService.processRawData(getSessionToken(), dataSetProcessingKey, rawDataSampleIDs);
+ rawDataService.processRawData(getSessionToken(), dataSetProcessingKey, rawDataSampleIDs, "");
}
}
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataService.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataService.java
index dbfb125b476e8041683c487b5a38baaeaf272b98..ef8776175c0cddc9deff28f8ef887dc0bb1d13dd 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataService.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataService.java
@@ -110,7 +110,7 @@ public class RawDataService extends AbstractServer<IRawDataService> implements I
try
{
service.processRawData(session.getSessionToken(), dataSetProcessingKey,
- rawDataSampleIDs);
+ rawDataSampleIDs, "");
} finally
{
service.logout(session.getSessionToken());
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java
index 006872586744a86d10176bc8cea19a4a9c84df1f..def74792eafd0935e47bfd2575eadc774aafe984 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java
@@ -99,7 +99,7 @@ public class RawDataServiceInternal extends AbstractServer<IRawDataServiceIntern
}
public void processRawData(String sessionToken, String dataSetProcessingKey,
- long[] rawDataSampleIDs)
+ long[] rawDataSampleIDs, String dataSetType)
{
Session session = getSession(sessionToken);
PersonPE person = session.tryGetPerson();
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalLogger.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalLogger.java
index 1c31bddd1fd96ba8f49f857156463ae430252031..784e9f04985998604fc8a53a2c272b62e759f9a3 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalLogger.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalLogger.java
@@ -45,10 +45,12 @@ class RawDataServiceInternalLogger extends AbstractServerLogger implements IRawD
return null;
}
- public void processRawData(String sessionToken, String dataSetProcessingKey, long[] rawDataSampleIDs)
+ public void processRawData(String sessionToken, String dataSetProcessingKey,
+ long[] rawDataSampleIDs, String dataSetType)
{
int numberOfDataSets = rawDataSampleIDs == null ? 0 : rawDataSampleIDs.length;
- logAccess(sessionToken, "copy_raw_data", "NUMBER_OF_DATA_SETS(%s)", numberOfDataSets);
+ logAccess(sessionToken, "copy_raw_data", "NUMBER_OF_DATA_SETS(%s), DATA_SET_TYPE(%s)",
+ numberOfDataSets, dataSetType);
}
}
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/IRawDataServiceInternal.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/IRawDataServiceInternal.java
index 7fe13797ea7ad78d8186dd8872055150dac8cd2f..72c86d06156111acd5c0ebfe19bc4a772710722b 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/IRawDataServiceInternal.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/IRawDataServiceInternal.java
@@ -45,5 +45,6 @@ public interface IRawDataServiceInternal extends IServer
@Transactional(readOnly = true)
@RolesAllowed(RoleSet.USER)
- public void processRawData(String sessionToken, String dataSetProcessingKey, long[] rawDataSampleIDs);
+ public void processRawData(String sessionToken, String dataSetProcessingKey,
+ long[] rawDataSampleIDs, String dataSetType);
}
\ No newline at end of file
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProviderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProviderTest.java
index e624c1b2f6356a5eeee499052315a1143809a2e6..816d9e7278cc963fc445162ba49a6bba5489c9d1 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProviderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProviderTest.java
@@ -21,7 +21,6 @@ import static ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.server.RawD
import static ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.server.RawDataSampleProvider.REGISTRATION_DATE;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -40,6 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.IRawDataServiceInternal;
+import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.dto.MsInjectionSample;
/**
*
@@ -214,7 +214,12 @@ public class RawDataSampleProviderTest extends AbstractServerTestCase
{
{
one(service).listRawDataSamples(SESSION_TOKEN);
- will(returnValue(Arrays.asList(samples)));
+ List<MsInjectionSample> list = new ArrayList<MsInjectionSample>();
+ for (Sample sample : samples)
+ {
+ list.add(new MsInjectionSample(sample));
+ }
+ will(returnValue(list));
}
});
}
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalTest.java
index 11504d334f12291d703aa1e45bba6caad846bf8a..40ef550f52caa589a9bd3a5b2e2dc92e7ed2253f 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternalTest.java
@@ -132,7 +132,7 @@ public class RawDataServiceInternalTest extends AbstractServerTestCase
});
- service.processRawData(SESSION_TOKEN, COPY_PROCESSING_KEY, ids);
+ service.processRawData(SESSION_TOKEN, COPY_PROCESSING_KEY, ids, "");
context.assertIsSatisfied();
}
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceTest.java
index af5128232cd6c5a9b2f2c098e6ca1e79a171aa8e..f1f7cb099167450c80454370e2dc8ca530689b9b 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceTest.java
@@ -29,6 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.IRawDataService;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.IRawDataServiceInternal;
+import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.dto.MsInjectionSample;
/**
*
@@ -80,7 +81,7 @@ public class RawDataServiceTest extends AbstractServerTestCase
{
{
one(internalService).listRawDataSamples(session2.getSessionToken());
- will(returnValue(Arrays.asList(sample)));
+ will(returnValue(Arrays.asList(new MsInjectionSample(sample))));
}
});
@@ -118,7 +119,7 @@ public class RawDataServiceTest extends AbstractServerTestCase
context.checking(new Expectations()
{
{
- one(internalService).processRawData(session2.getSessionToken(), null, ids);
+ one(internalService).processRawData(session2.getSessionToken(), null, ids, "");
}
});