From 707c5fccfd3896ef16ad4d18ca11012926c6d468 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Fri, 25 Sep 2015 14:42:22 +0000
Subject: [PATCH] removed creating directory when starting experiment from gui
---
.../serviceconn/DaqServiceConnection.java | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java
index 9107628b..6ea9afd2 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java
@@ -45,23 +45,7 @@ public class DaqServiceConnection extends ServiceConnection{
data.put(Keyword.DAQ_EXPERIMENT_NAME, encode(experimentName));
data.put(Keyword.DAQ_DATA_DIRECTORY, encode(directory));
- if ((new File(directory)).exists()) {
- invokeSessionPostRequest(StorageServUrl.START_DAQ, data);
- } else if ((new File(dateDirectory)).exists()) {
- if (new File(directory).mkdir()) {
- invokeSessionPostRequest(StorageServUrl.START_DAQ, data);
- } else {
- JOptionPane.showMessageDialog(null,"Can't start experiment " + experimentName + " in DAQ service. The experiment directory can't be created.",
- "Warning",JOptionPane.WARNING_MESSAGE);
- }
- } else {
- if ((new File(dateDirectory).mkdir()) && (new File(directory).mkdir())) {
- invokeSessionPostRequest(StorageServUrl.START_DAQ, data);
- } else {
- JOptionPane.showMessageDialog(null,"Can't start experiment " + experimentName + " in DAQ service. The experiment directory can't be created.",
- "Warning",JOptionPane.WARNING_MESSAGE);
- }
- }
+ invokeSessionPostRequest(StorageServUrl.START_DAQ, data);
}
public void stopDaq(String experimentName) {
--
GitLab