Simulation context type selection is fixed in study search. Lucene is no more used...

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / SearchStudyAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java b/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java
index 423e39c374d2f9f9c7def02e8e134f1a9807eb68..b331929ba5a7540eeccd5a38af463feec97f18ea 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java
+++ b/Workspace/Siman/src/org/splat/simer/SearchStudyAction.java
@@ -8,7 +8,6 @@ import org.splat.dal.bo.som.ProgressState;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.dal.bo.som.SimulationContextType;
 import org.splat.dal.bo.som.Study;
-import org.splat.dal.bo.som.Visibility;
 import org.splat.kernel.InvalidPropertyException;
 import org.splat.service.SearchService;
 import org.splat.service.technical.ProjectSettingsService;
@@ -117,14 +116,11 @@ public class SearchStudyAction extends AbstractSearchBaseAction {
                        User him = getUserService().selectUser(index);
                        sprop.setManager(him);
                }
-               // Set of the visibility
-               Study.Properties other = sprop.copy();
-
-               other.setVisibility(Visibility.PUBLIC);
-               sprop.setVisibility(Visibility.PRIVATE);
                sprop.setActor(getConnectedUser());
 
-               _result = getSearchService().selectStudiesWhere(sprop, other);
+               _result = getSearchService().selectStudiesWhere(
+                               "all".equals(_criteriaMatch), "all".equals(_contextMatch),
+                               sprop);
                session.put(RESULT_KEY, _result); // For redisplaying the page without re-executing the search
                return "refresh";
        }