LMS-778 bug in applicationContext.xml fixed and query method requesting known...

LMS-778 bug in applicationContext.xml fixed and query method requesting known data sets implemented.

SVN: 10195

datastore_server/source/java/applicationContext.xml

@@ -32,7 +32,7 @@
         <property name="service">
             <bean class="ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService">
                 <constructor-arg ref="session-token-manager" />
-                <property name="storeRoot" value="storeroot-dir"/>
+                <property name="storeRoot" value="${storeroot-dir}"/>
             </bean>
         </property>
         <property name="serviceInterface" value="ch.systemsx.cisd.openbis.generic.shared.IDataStoreService" />

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.InitializingBean;
@@ -96,6 +97,22 @@ public class DataStoreService extends AbstractServiceWithLogger<IDataStoreServic
         return IDataStoreService.VERSION;
     }
 
+    public List<String> getKnownDataSets(String sessionToken, List<String> dataSetLocations)
+            throws InvalidAuthenticationException
+    {
+        sessionTokenManager.assertValidSessionToken(sessionToken);
+        
+        List<String> knownLocations = new ArrayList<String>();
+        for (String location : dataSetLocations)
+        {
+            if (new File(storeRoot, location).exists())
+            {
+                knownLocations.add(location);
+            }
+        }
+        return knownLocations;
+    }
+
     public void deleteDataSets(String sessionToken, List<String> dataSetLocations)
             throws InvalidAuthenticationException
     {

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java

@@ -69,10 +69,17 @@ class DataStoreServiceLogger implements IDataStoreService
         return 0;
     }
 
+    public List<String> getKnownDataSets(String sessionToken, List<String> dataSetLocations)
+            throws InvalidAuthenticationException
+    {
+        log("get_known_data_sets", "LOCATIONS(%s)", dataSetLocations);
+        return null;
+    }
+
     public void deleteDataSets(String sessionToken, List<String> dataSetLocations)
             throws InvalidAuthenticationException
     {
-        log("delete_data_set", "DELETE(%s)", dataSetLocations);
+        log("delete_data_sets", "LOCATIONS(%s)", dataSetLocations);
     }
 
 }