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

CC-1927: Remove PEAR DB 

-missed some conflicts :/
This commit is contained in:
Martin Konecny 2012-04-19 17:03:13 -04:00
parent cba253439a
commit 16f3a331bb
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
airtime_mvc/application/models/Show.php
View File

@ -1165,15 +1165,8 @@ class Application_Model_Show {
*/ */
public static function populateShowUntil($p_showId) public static function populateShowUntil($p_showId)
{ {
<<<<<<< HEAD
global $CC_DBC;
$date = Application_Model_Preference::GetShowsPopulatedUntil();
=======
$con = Propel::getConnection(); $con = Propel::getConnection();
$date = Application_Model_Preference::GetShowsPopulatedUntil();
if (is_null($p_dateTime)) {
$date = Application_Model_Preference::GetShowsPopulatedUntil();
>>>>>>> CC-1927: Remove PEAR DB
if (is_null($date)) { if (is_null($date)) {
$p_populateUntilDateTime = new DateTime("now", new DateTimeZone('UTC')); $p_populateUntilDateTime = new DateTime("now", new DateTimeZone('UTC'));
@ -1228,13 +1221,8 @@ class Application_Model_Show {
*/ */
private static function populateNonRepeatingShow($p_showRow, $p_populateUntilDateTime) private static function populateNonRepeatingShow($p_showRow, $p_populateUntilDateTime)
{ {
<<<<<<< HEAD
global $CC_DBC;
=======
$con = Propel::getConnection(); $con = Propel::getConnection();
>>>>>>> CC-1927: Remove PEAR DB
$show_id = $p_showRow["show_id"]; $show_id = $p_showRow["show_id"];
$first_show = $p_showRow["first_show"]; //non-UTC $first_show = $p_showRow["first_show"]; //non-UTC
$start_time = $p_showRow["start_time"]; //non-UTC $start_time = $p_showRow["start_time"]; //non-UTC
@ -1278,13 +1266,7 @@ class Application_Model_Show {
//Logging::log('$start time of non repeating record '.$start); //Logging::log('$start time of non repeating record '.$start);
<<<<<<< HEAD
self::createRebroadcastInstances($rebroadcasts, $currentUtcTimestamp, $show_id, $show_instance_id, $start, $duration, $timezone); self::createRebroadcastInstances($rebroadcasts, $currentUtcTimestamp, $show_id, $show_instance_id, $start, $duration, $timezone);
=======
if ($newInstance) {
self::createRebroadcastInstances($rebroadcasts, $currentUtcTimestamp, $show_id, $show_instance_id, $start, $duration, $timezone);
}
>>>>>>> CC-1927: Remove PEAR DB
} }
} }
@ -1331,11 +1313,7 @@ class Application_Model_Show {
$show = new Application_Model_Show($show_id); $show = new Application_Model_Show($show_id);
<<<<<<< HEAD while ($utcStartDateTime->getTimestamp() <= $p_populateUntilDateTime->getTimestamp()
while($utcStartDateTime->getTimestamp() <= $p_populateUntilDateTime->getTimestamp()
=======
while ($utcStartDateTime->getTimestamp() <= $p_dateTime->getTimestamp()
>>>>>>> CC-1927: Remove PEAR DB
&& (is_null($utcLastShowDateTime) || $utcStartDateTime->getTimestamp() < $utcLastShowDateTime->getTimestamp())){ && (is_null($utcLastShowDateTime) || $utcStartDateTime->getTimestamp() < $utcLastShowDateTime->getTimestamp())){
list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone); list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone);
@ -1743,13 +1721,8 @@ class Application_Model_Show {
global $CC_CONFIG; global $CC_CONFIG;
$con = Propel::getConnection(); $con = Propel::getConnection();
if($timeNow == null){ if($timeNow == null){
<<<<<<< HEAD
$date = new Application_Common_DateHelper; $date = new Application_Common_DateHelper;
$timeNow = $date->getUtcTimestamp(); $timeNow = $date->getUtcTimestamp();
=======
$date = new Application_Model_DateHelper;
$timeNow = $date->getUtcTimestamp();
>>>>>>> CC-1927: Remove PEAR DB
} }
//TODO, returning starts + ends twice (once with an alias). Unify this after the 2.0 release. --Martin //TODO, returning starts + ends twice (once with an alias). Unify this after the 2.0 release. --Martin
$sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record, s.url, starts, ends" $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record, s.url, starts, ends"