Skip to content
Snippets Groups Projects
Commit 8c165798 authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

fixed ExperimentSynchronizer daqConnection file

parent d46b3fb7
No related branches found
No related tags found
No related merge requests found
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);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment