LMS-1502 Changed how the CINA data sets are registered.

SVN: 16357

datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerRpc.java

@@ -20,6 +20,7 @@ import java.io.File;
 import java.util.List;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
 
 /**
@@ -46,7 +47,7 @@ public interface IDataSetHandlerRpc extends IDataSetHandler
     public SessionContextDTO getSessionContext();
 
     /**
-     * Get the file for a path from the data store.
+     * Get the file for an external data from the data store.
      */
-    public File getStoreFileForPath(String path);
+    public File getFileForExternalData(ExternalData data);
 }

datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java

@@ -38,6 +38,7 @@ import ch.systemsx.cisd.common.io.ConcatenatedFileOutputStreamWriter;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
 import ch.systemsx.cisd.etlserver.DataSetRegistrationAlgorithm;
+import ch.systemsx.cisd.etlserver.DefaultStorageProcessor;
 import ch.systemsx.cisd.etlserver.IDataSetHandler;
 import ch.systemsx.cisd.etlserver.IDataSetHandlerRpc;
 import ch.systemsx.cisd.etlserver.IDataSetInfoExtractor;
@@ -54,6 +55,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.NewDataSetDTO.DataSetO
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.LocatorType;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
@@ -551,8 +553,9 @@ class PutDataSetExecutor implements IDataSetHandlerRpc
         }
     }
 
-    public File getStoreFileForPath(String path)
+    public File getFileForExternalData(ExternalData externalData)
     {
-        return new File(service.getStoreRootDirectory(), path);
+        File dataSetFile = new File(service.getStoreRootDirectory(), externalData.getLocation());
+        return DefaultStorageProcessor.getOriginalDirectory(dataSetFile);
     }
 }