From bd24e9a185564f8fc42bdd9a1c0c87fc0d51f7f8 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 27 Oct 2011 12:07:10 +0200 Subject: running 123 --- application/controllers/EventController.php | 31 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'application') diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 910a5a0..83058ca 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -278,10 +278,10 @@ class EventController extends Zend_Controller_Action $eventCategory = $eventcategories[$event->getCategory()]; $runningtypeMapper = new Application_Model_RunningtypeMapper(); $runningtype = $runningtypeMapper->findBy(array("title" => $eventCategory)); - $event->setRunning(true); + $event->setRunning(1); $event->setRunningtype($runningtype[0]->getID()); } else { - $event->setRunning(false); + $event->setRunning(0); } $event->setCreated(time()); $overlapping = 0; @@ -582,6 +582,7 @@ class EventController extends Zend_Controller_Action $this->getRequest()->setParam('pbs_bootosID', $event->getPbs_bootosID()); $this->getRequest()->setParam('pbs_configID_' . $event->getPbs_bootosID(), $event->getPbs_configID()); $this->getRequest()->setParam('pbs_membershipID', $event->getPbs_membershipID()); + $this->getRequest()->setParam('force', $event->getForce()); $params = $this->getRequest()->getParams(); $editForm = new Application_Form_EventEdit(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'configlist' => $configlist, 'poollist' => $poollist, 'repeattypelist' => $repeattypelist, 'repeatendlist' => $repeatendlist, 'oldtitle' => $event->getTitle(), 'params' => $params)); } @@ -1745,7 +1746,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "boot")); $runningtypeBoot = $result[0]; - $event->setRunning(true); + $event->setRunning(1); $event->setRunningtype($runningtypeBoot->getID()); try { $this->eventMapper->save($event); @@ -1766,7 +1767,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "shutdown")); $runningtypeShutdown = $result[0]; - $event->setRunning(true); + $event->setRunning(1); $event->setRunningtype($runningtypeShutdown->getID()); try { $this->eventMapper->save($event); @@ -1841,7 +1842,7 @@ class EventController extends Zend_Controller_Action if($eventResult->$resultShortcutName == "not finished") { continue; } else if($eventResult->$resultShortcutName == 'not founded') { - $event->setRunning(false); + $event->setRunning(0); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1861,6 +1862,9 @@ class EventController extends Zend_Controller_Action $eventreport->setCreated(time()); if($eventResult->$resultShortcutName == "failed") { $eventreport->setErrors(json_encode($eventResult->$errorsName)); + $event->setRunning(3); + } else { + $event->setRunning(2); } $eventreport->setType($runningtypeBoot->getID()); try { @@ -1871,7 +1875,7 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } - $event->setRunning(false); + $event->setRunning(0); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1905,7 +1909,7 @@ class EventController extends Zend_Controller_Action if($eventResult->$resultShortcutName == "not finished") { continue; } else if($eventResult->$resultShortcutName == 'not founded') { - $event->setRunning(false); + $event->setRunning(0); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -1925,6 +1929,9 @@ class EventController extends Zend_Controller_Action $eventreport->setCreated(time()); if($eventResult->$resultShortcutName == "failed") { $eventreport->setErrors(json_encode($eventResult->$errorsName)); + $event->setRunning(3); + } else { + $event->setRunning(2); } $eventreport->setType($runningtypeShutdown->getID()); try { @@ -1935,7 +1942,6 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } - $event->setRunning(false); $event->setRunningtype(null); try { $this->eventMapper->save($event); @@ -2049,6 +2055,11 @@ class EventController extends Zend_Controller_Action $data = array( 'eventName' => $event->getTitle(), ); + if($event->getForce()) { + $data['force'] = true; + } else { + $data['force'] = false; + } $poolRequest = "poolid=" . $event->getPbs_poolID(); $this->config['pbs2']['getpools']; $poolApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getpools'] . $apikey, 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $poolRequest); @@ -2155,7 +2166,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "boot")); $runningtypeBoot = $result[0]; - $event->setRunning(true); + $event->setRunning(1); $event->setRunningtype($runningtypeBoot->getID()); try { $this->eventMapper->save($event); @@ -2176,7 +2187,7 @@ class EventController extends Zend_Controller_Action $results[$event->getTitle()] = $result; $result = $runningtypeMapper->findBy(array("title" => "shutdown")); $runningtypeShutdown = $result[0]; - $event->setRunning(true); + $event->setRunning(1); $event->setRunningtype($runningtypeShutdown->getID()); try { $this->eventMapper->save($event); -- cgit v1.2.3-55-g7522