Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-04-03 13:53:24 -04:00
parent 44e3217f3a 057ca55074
commit 012ecc4698
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
airtime_mvc/application/models/Scheduler.php
View File

@ -559,17 +559,20 @@ class Application_Model_Scheduler {
->filterByDbInstanceId($p_id) ->filterByDbInstanceId($p_id)
->filterByDbEnds($this->nowDT, Criteria::GREATER_THAN) ->filterByDbEnds($this->nowDT, Criteria::GREATER_THAN)
->find($this->con); ->find($this->con);
$remove = array(); if (count($items) > 0) {
$ts = $this->nowDT->format('U'); $remove = array();
$ts = $this->nowDT->format('U');
for($i = 0; $i < count($items); $i++) {
$remove[$i]["instance"] = $p_id; for($i = 0; $i < count($items); $i++) {
$remove[$i]["timestamp"] = $ts; $remove[$i]["instance"] = $p_id;
$remove[$i]["id"] = $items[$i]->getDbId(); $remove[$i]["timestamp"] = $ts;
$remove[$i]["id"] = $items[$i]->getDbId();
}
$this->removeItems($remove, false);
} }
$this->removeItems($remove, false);
$instance->setDbEnds($this->nowDT); $instance->setDbEnds($this->nowDT);
$instance->save($this->con); $instance->save($this->con);
} }
@ -578,6 +581,10 @@ class Application_Model_Scheduler {
} }
$this->con->commit(); $this->con->commit();
if ($instance->getDbRecord()) {
Application_Model_RabbitMq::SendMessageToShowRecorder("cancel_recording");
}
} }
catch (Exception $e) { catch (Exception $e) {
$this->con->rollback(); $this->con->rollback();