import org.hibernate.Session;
import org.hibernate.Transaction;
import org.splat.kernel.InvalidPropertyException;
-import org.splat.kernel.User;
+import org.splat.dal.bo.kernel.User;
import org.splat.kernel.UserDirectory;
-import org.splat.som.Database;
-import org.splat.som.ProgressState;
-import org.splat.som.ProjectSettings;
-import org.splat.som.SimulationContext;
-import org.splat.som.SimulationContextType;
-import org.splat.som.Study;
-import org.splat.som.Visibility;
+import org.splat.dal.dao.som.Database;
+import org.splat.dal.bo.som.ProgressState;
+import org.splat.service.SearchService;
+import org.splat.service.technical.ProjectSettingsService;
+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;
public class SearchStudyAction extends SearchBaseAction {
private String matcontext = null; // "all" or "any"
private String refid = null; // Study reference
private String words = null; // Full text search words
+ private SearchService _searchService;
+ private ProjectSettingsService _projectSettingsService;
private static final long serialVersionUID = -1910481357051393077L;
sprop.setVisibility(Visibility.PRIVATE);
sprop.setActor(user);
- result = Database.selectStudiesWhere(sprop, other);
+ result = getSearchService().selectStudiesWhere(sprop, other);
}
else {
Visibility reparea = null;
sprop.setVisibility(reparea);
if (reparea == Visibility.PRIVATE) sprop.setActor(user);
- result = Database.selectStudiesWhere(sprop);
+ result = getSearchService().selectStudiesWhere(sprop);
}
session.put("search.result", result); // For redisplaying the page without re-executing the search
return "refresh";
protected List<SimulationContextType> getInvolvedContexts () {
// ------------------------------------------------------------
- List<ProjectSettings.Step> steps = ProjectSettings.getStepsOf(Study.class);
- ProjectSettings.Step[] number = steps.toArray(new ProjectSettings.Step[steps.size()]);
+ List<ProjectSettingsService.Step> steps = getProjectSettings().getStepsOf(Study.class);
+ ProjectSettingsService.Step[] number = steps.toArray(new ProjectSettingsService.Step[steps.size()]);
return SimulationContext.selectTypesOf(number);
}
context = (List<SimulationContext>)filter.get("context"); // Only criteria not part of the form
}
+ /**
+ * Get the searchService.
+ * @return the searchService
+ */
+ public SearchService getSearchService() {
+ return _searchService;
+ }
+
+ /**
+ * Set the searchService.
+ * @param searchService the searchService to set
+ */
+ public void setSearchService(SearchService searchService) {
+ _searchService = searchService;
+ }
+ /**
+ * Get project settings.
+ * @return Project settings service
+ */
+ private ProjectSettingsService getProjectSettings() {
+ return _projectSettingsService;
+ }
+
+ /**
+ * Set project settings service.
+ * @param projectSettingsService project settings service
+ */
+ public void setProjectSettings(
+ ProjectSettingsService projectSettingsService) {
+ _projectSettingsService = projectSettingsService;
+ }
}
\ No newline at end of file