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 6c02f70ca68f4ebc080c63337b2c1de65cc42cfd..6afeeba0ad7bed330a16b5dcf1740c17c15e8083 100644 --- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java +++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java @@ -1,45 +1,5 @@ package gov.anl.dm.esafsync.serviceconn; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import javax.swing.JOptionPane; - -public class DaqServiceConnection extends ServiceConnection{ - - class Keyword { - static final String DAQ_EXPERIMENT_NAME = "experimentName"; - static final String DAQ_DATA_DIRECTORY = "dataDirectory"; - } - - class StorageServUrl { - static final String START_DAQ = "/experiments/startDaq"; - static final String STOP_DAQ = "/experiments/stopDaq"; - } - - private final Properties config; - - public DaqServiceConnection(Properties configProperties) { - this.config = configProperties; - } - - public final int init() { - String url = config.getProperty("dm.daqServ.connection"); - return super.init(url); - } - - public void startDaq(String experimentName) { - String dataDir = config.getProperty("dm.daq.datadir"); - String directory; - if (dataDir.endsWith("/")) { - directory = dataDir + experimentName; - } else { - directory = dataDir + "/" + experimentName; - } - package gov.anl.dm.esafsync.serviceconn; - import java.io.File; import java.util.HashMap; import java.util.Map; @@ -113,34 +73,3 @@ public class DaqServiceConnection extends ServiceConnection{ } - Map<String, String> data = new HashMap<>(); - data.put(Keyword.DAQ_EXPERIMENT_NAME, encode(experimentName)); - data.put(Keyword.DAQ_DATA_DIRECTORY, encode(directory)); - - if ((new File(dataDir)).exists()) { - if ((new File(directory)).exists()) { - invokeSessionPostRequest(StorageServUrl.START_DAQ, data); - } else 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(dataDir).mkdir()) && (new File(directory).mkdir())) { - invokeSessionPostRequest(StorageServUrl.START_DAQ, data); - } else { - JOptionPane.showMessageDialog(null,"Can't start experiment " + experimentName + " in DAQ service. The configured data directory does not exist and can't be created.", - "Error",JOptionPane.ERROR_MESSAGE); - } - } - } - - public void stopDaq(String experimentName) { - Map<String, String> data = new HashMap<>(); - data.put(Keyword.DAQ_EXPERIMENT_NAME, encode(experimentName)); - invokeSessionPostRequest(StorageServUrl.STOP_DAQ, data); - } - -} -