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

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

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-04 14:55:28 -04:00
commit 1fcd20fea3
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
airtime_mvc/application/models/Show.php
View file

@ -1831,9 +1831,9 @@ SELECT si.starts AS start_timestamp,
FROM cc_show_instances si, FROM cc_show_instances si,
cc_show s cc_show s
WHERE si.show_id = s.id WHERE si.show_id = s.id
AND si.starts <= TIMESTAMP ':timeNow1' AND si.starts <= :timeNow1::timestamp
AND si.ends > TIMESTAMP ':timeNow2' AND si.ends > :timeNow2::timestamp
AND modified_instance != TRUE" AND modified_instance != TRUE
SQL; SQL;
$stmt = $con->prepare($sql); $stmt = $con->prepare($sql);
@ -1873,15 +1873,16 @@ SELECT si.starts AS start_timestamp,
FROM cc_show_instances si, FROM cc_show_instances si,
cc_show s cc_show s
WHERE si.show_id = s.id WHERE si.show_id = s.id
AND si.starts > TIMESTAMP ':timeNow1' - INTERVAL '2 days' AND si.starts > :timeNow1::timestamp - INTERVAL '2 days'
AND si.ends < TIMESTAMP ':timeNow2' + INTERVAL '2 days' AND si.ends < :timeNow2::timestamp + INTERVAL '2 days'
AND modified_instance != TRUE AND modified_instance != TRUE
ORDER BY si.starts ORDER BY si.starts
SQL; SQL;
$stmt = $con->prepare($sql); $stmt = $con->prepare($sql);
$stmt->bindParam(':timeNow1', $p_timeNow);
$stmt->bindParam(':timeNow2', $p_timeNow); $stmt->bindValue(':timeNow1', $p_timeNow);
$stmt->bindValue(':timeNow2', $p_timeNow);
if ($stmt->execute()) { if ($stmt->execute()) {
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
@ -2010,8 +2011,8 @@ SELECT si.starts AS start_timestamp,
FROM cc_show_instances, FROM cc_show_instances,
cc_show cc_show
WHERE si.show_id = s.id" WHERE si.show_id = s.id"
AND si.starts >= TIMESTAMP ':timeStart' AND si.starts >= :timeStart::timestamp
AND si.starts < TIMESTAMP ':timeEnd' AND si.starts < :timeEnd::timestamp
AND modified_instance != TRUE AND modified_instance != TRUE
ORDER BY si.starts ORDER BY si.starts
LIMIT :lim LIMIT :lim