summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/views/scripts/event/checkoverlapevents.phtml19
-rwxr-xr-xapplication/views/scripts/event/index.phtml15
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Boot.java4
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/BootWorker.java21
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/Shutdown.java2
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/ShutdownWorker.java4
6 files changed, 37 insertions, 28 deletions
diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml
index 5ce631b..6558e19 100644
--- a/application/views/scripts/event/checkoverlapevents.phtml
+++ b/application/views/scripts/event/checkoverlapevents.phtml
@@ -3,29 +3,32 @@
//print_r($this->overlaps);
//$overlaps[] = array();
+
+
if(count($this->overlapswithrepeat) == 0) {
- echo -1;
+ $output['withrepeat'] = -1;
}
else {
- echo '<ul id="conflictEvents">';
+ $output['withrepeat'] = '<ul id="conflictEvents">';
foreach($this->overlapswithrepeat as $o){
- echo '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
+ $output['withrepeat'] .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
}
- echo '</ul>';
+ $output['withrepeat'] .= '</ul>';
// Echo contents of output, e.g. required values, such as title, date, etc.
//echo json_encode($this->overlaps);
}
if(count($this->overlapswithoutrepeat) == 0) {
- echo -1;
+ $output['withoutrepeat'] = -1;
}
else {
- echo '<ul id="conflictEvents">';
+ $output['withoutrepeat'] = '<ul id="conflictEvents">';
foreach($this->overlapswithoutrepeat as $o){
- echo '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
+ $output['withoutrepeat'] .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
}
- echo '</ul>';
+ $output['withoutrepeat'] .= '</ul>';
// Echo contents of output, e.g. required values, such as title, date, etc.
//echo json_encode($this->overlaps);
}
+echo json_encode($output);
?> \ No newline at end of file
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index d4da032..bbf7db7 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -432,17 +432,18 @@ var dayClick = false;
});
});
- $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(checkoverlapeventsresult){
- var cell = document.getElementById("conflicts");
- cell.removeChild(cell.firstChild);
- $("#conflicts").append(checkoverlapeventsresult);
- alert(checkoverlapeventsresult.withrepeat + ' ' + checkoverlapeventsresult.withoutrepeat);
- if(checkoverlapeventsresult == -1) {
+ $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(data){
+ //var cell = document.getElementById("conflicts");
+ //cell.removeChild(cell.firstChild);
+ //$("#conflicts").append(data);
+ var returndata = jQuery.parseJSON(data);
+ //alert(returndata.withrepeat + ' ' + returndata.withoutrepeat);
+ /*if(checkoverlapeventsresult == -1) {
isDroppable = true;
overlapevents = null;
} else {
isDroppable = false;
- }
+ }*/
if(event.repeat == 0 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {
diff --git a/gearman/controllerWorker/ControllerWorker/Boot.java b/gearman/controllerWorker/ControllerWorker/Boot.java
index d960098..a560c80 100755
--- a/gearman/controllerWorker/ControllerWorker/Boot.java
+++ b/gearman/controllerWorker/ControllerWorker/Boot.java
@@ -42,7 +42,7 @@ public class Boot extends Thread {
private Boolean error;
public Boot(String eventName, Vector<Client> clients, String bootOS,
- int updateRate, long waitTime, Vector<String> psWhitelist,
+ int updateRate, long waitTime, long scsavTime, Vector<String> psWhitelist,
Vector<String> psBlacklist, String gearmanServerAddress,
int gearmanServerPort) {
this.eventName = eventName;
@@ -727,7 +727,7 @@ public class Boot extends Thread {
JSONObject resultObj = (JSONObject) JSONValue.parse(result);
if (!resultObj.containsKey("err")) {
JSONArray ps = (JSONArray) resultObj.get("ps");
- //scsavPID = resultObj.get("pid").toString();
+ //int scsavPID = Integer.parseInt(resultObj.get("pid").toString());
// boolean whitelistFound = false;
boolean blacklistFound = false;
diff --git a/gearman/controllerWorker/ControllerWorker/BootWorker.java b/gearman/controllerWorker/ControllerWorker/BootWorker.java
index 8d3e612..a95f3a5 100755
--- a/gearman/controllerWorker/ControllerWorker/BootWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/BootWorker.java
@@ -48,10 +48,12 @@ public class BootWorker extends AbstractGearmanFunction {
.getString("gearman.server.host");
int gearmanServerPort = Integer.parseInt(ControllerWorkerMain
.getApplication_ini().getString("gearman.server.port"));
- long waitTime = Long.parseLong(ControllerWorkerMain
- .getApplication_ini().getString("gearman.worker.waitTime"));
- int updateRate = Integer.parseInt(ControllerWorkerMain
- .getApplication_ini().getString("gearman.worker.updateRate"));
+ long waitTime = Long.parseLong(ControllerWorkerMain.getApplication_ini()
+ .getString("gearman.worker.waitTime"));
+ long scsavTime = Integer.parseInt(ControllerWorkerMain.getApplication_ini()
+ .getString("gearman.worker.scsavTime"));
+ int updateRate = Integer.parseInt(ControllerWorkerMain.getApplication_ini()
+ .getString("gearman.worker.updateRate"));
String blacklist = ControllerWorkerMain.getApplication_ini().getString(
"gearman.worker.ps.blacklist");
StringTokenizer blacklistTokenizer = new StringTokenizer(blacklist, ",");
@@ -70,7 +72,8 @@ public class BootWorker extends AbstractGearmanFunction {
}
Boot boot = new Boot(event, clients, eventOS, updateRate, waitTime,
- psWhitelist, psBlacklist, gearmanServerHost, gearmanServerPort);
+ scsavTime, psWhitelist, psBlacklist, gearmanServerHost,
+ gearmanServerPort);
GearmanJobServerConnection gearmanConnection = new GearmanNIOJobServerConnection(
gearmanServerHost, gearmanServerPort);
GearmanClient gearmanClient = new GearmanClientImpl();
@@ -81,8 +84,8 @@ public class BootWorker extends AbstractGearmanFunction {
jsonData.put("eventOS", eventOS);
jsonData.put("clients", jsonClients);
String dataString = JSONValue.toJSONString(jsonData);
- GearmanJob job = GearmanJobImpl.createJob("status", dataString
- .getBytes(), "status" + event);
+ GearmanJob job = GearmanJobImpl.createJob("status", dataString.getBytes(),
+ "status" + event);
gearmanClient.submit(job);
boot.start();
logger.info("Booting of " + event + " started");
@@ -92,8 +95,8 @@ public class BootWorker extends AbstractGearmanFunction {
byte[] exceptions = new byte[0];
int numerator = 0;
int denominator = 0;
- GearmanJobResult gjr = new GearmanJobResultImpl(this.jobHandle, true,
- res.getBytes(), warnings, exceptions, numerator, denominator);
+ GearmanJobResult gjr = new GearmanJobResultImpl(this.jobHandle, true, res
+ .getBytes(), warnings, exceptions, numerator, denominator);
return gjr;
}
} \ No newline at end of file
diff --git a/gearman/controllerWorker/ControllerWorker/Shutdown.java b/gearman/controllerWorker/ControllerWorker/Shutdown.java
index 8c90d7f..0b7082e 100755
--- a/gearman/controllerWorker/ControllerWorker/Shutdown.java
+++ b/gearman/controllerWorker/ControllerWorker/Shutdown.java
@@ -41,7 +41,7 @@ public class Shutdown extends Thread {
private Boolean error;
public Shutdown(String eventName, Vector<Client> clients, int updateRate,
- long waitTime, Vector<String> psWhitelist,
+ long waitTime, long scsavTime, Vector<String> psWhitelist,
Vector<String> psBlacklist, String gearmanServerAddress,
int gearmanServerPort) {
this.eventName = eventName;
diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
index 631e8b7..65ad5b9 100755
--- a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java
@@ -49,6 +49,8 @@ public class ShutdownWorker extends AbstractGearmanFunction {
.getApplication_ini().getString("gearman.server.port"));
long waitTime = Long.parseLong(ControllerWorkerMain
.getApplication_ini().getString("gearman.worker.waitTime"));
+ long scsavTime = Integer.parseInt(ControllerWorkerMain
+ .getApplication_ini().getString("gearman.worker.scsavTime"));
int updateRate = Integer.parseInt(ControllerWorkerMain
.getApplication_ini().getString("gearman.worker.updateRate"));
String blacklist = ControllerWorkerMain.getApplication_ini().getString(
@@ -68,7 +70,7 @@ public class ShutdownWorker extends AbstractGearmanFunction {
psBlacklist.add(blackEntry);
}
- Shutdown shutdown = new Shutdown(event, clients, updateRate, waitTime,
+ Shutdown shutdown = new Shutdown(event, clients, updateRate, waitTime, scsavTime,
psWhitelist, psBlacklist, gearmanServerHost, gearmanServerPort);
GearmanJobServerConnection gearmanConnection = new GearmanNIOJobServerConnection(
gearmanServerHost, gearmanServerPort);