From e8c2fe72c4007e34f426bd736bc8924b0a3c6a17 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Thu, 24 Sep 2015 18:52:21 +0000
Subject: [PATCH] changing experimentSynchronizer
---
.../src/gov/anl/dm/esafsync/ExperimentList.java | 12 +++---------
.../src/gov/anl/dm/esafsync/LoginWindow.java | 9 +++++++--
.../esafsync/serviceconn/DaqServiceConnection.java | 4 ++--
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java
index 73f7f876..ed8a2ba3 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java
@@ -432,7 +432,7 @@ class ExperimentList extends JFrame
}
private String convertDate2Dir(String startDate) throws ParseException {
- String month = startDate.substring(0,3);
+ String month = startDate.substring(3,6);
String numMonth = null;
if (month.equals("JAN")) {
numMonth = "01";
@@ -459,14 +459,8 @@ class ExperimentList extends JFrame
} else if (month.equals("DEC")) {
numMonth = "12";
}
- String agreableStartDate = numMonth + startDate.substring(3, startDate.length());
- // parse the date
- DateFormat f = new SimpleDateFormat("M-d-y");
- Date d = f.parse(agreableStartDate);
-
- // now print the date
- DateFormat out = new SimpleDateFormat("yyyy-MM");
- return out.format(d);
+
+ return "20" + startDate.substring(7, 9) + "-" + numMonth;
}
}
diff --git a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/LoginWindow.java b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/LoginWindow.java
index ab7aed25..ecf3bfe9 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/LoginWindow.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/LoginWindow.java
@@ -67,11 +67,16 @@ public final class LoginWindow extends JFrame {
// sconnection.setLogin(user, pass);
// dconnection.setLogin(user, pass);
int aaResult = sconnection.login(user, pass);
- if ((dconnection.login(user, pass) != aaResult) || (dconnection.login(user, pass) != aaResult)) {
+ if (dconnection.login(user, pass) != aaResult) {
JOptionPane.showMessageDialog(null,"inconsistent login response",
"Error",JOptionPane.ERROR_MESSAGE);
return;
- }
+ }
+ if ((drconnection != null) && (drconnection.login(user, pass) != aaResult)) {
+ JOptionPane.showMessageDialog(null,"inconsistent login response",
+ "Error",JOptionPane.ERROR_MESSAGE);
+ return;
+ }
switch (aaResult) {
case ServiceConnection.ServiceConnectionStatus.SUCCESS:
setVisible(false);
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 6afeeba0..9107628b 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/DaqServiceConnection.java
@@ -34,10 +34,10 @@ public class DaqServiceConnection extends ServiceConnection{
String directory;
String dateDirectory;
if (dataDir.endsWith("/")) {
- dateDirectory = dataDir + "/" + startDateDir;
+ dateDirectory = dataDir + startDateDir;
directory = dataDir + startDateDir + "/" + experimentName;
} else {
- dateDirectory = dataDir + startDateDir;
+ dateDirectory = dataDir + "/" + startDateDir;
directory = dataDir + "/" + startDateDir + "/" + experimentName;
}
--
GitLab