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

CC-84: Smart Playlists

Browse source 
- fixed a bug
- change LIKE to ILIKE
This commit is contained in:
James 2012-07-18 16:12:06 -04:00
parent 9516771099
commit 266d86d9e4
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
airtime_mvc/application/models/Playlist.php
View file

@ -47,12 +47,12 @@ class Application_Model_Playlist
); );
private static $modifier2CriteriaMap = array( private static $modifier2CriteriaMap = array(
"contains" => Criteria::LIKE, "contains" => Criteria::ILIKE,
"does not contain" => Criteria::NOT_LIKE, "does not contain" => Criteria::NOT_ILIKE,
"is" => Criteria::EQUAL, "is" => Criteria::EQUAL,
"is not" => Criteria::NOT_EQUAL, "is not" => Criteria::NOT_EQUAL,
"starts with" => Criteria::LIKE, "starts with" => Criteria::ILIKE,
"ends with" => Criteria::LIKE, "ends with" => Criteria::ILIKE,
"is greater than" => Criteria::GREATER_THAN, "is greater than" => Criteria::GREATER_THAN,
"is less than" => Criteria::LESS_THAN, "is less than" => Criteria::LESS_THAN,
"is in the range" => Criteria::CUSTOM); "is in the range" => Criteria::CUSTOM);
@ -1066,19 +1066,22 @@ class Application_Model_Playlist
foreach ($storedCrit["crit"] as $criteria) { foreach ($storedCrit["crit"] as $criteria) {
// propel doc says we should use phpname for column name but // propel doc says we should use phpname for column name but
// it looks like we have to use actual column name // it looks like we have to use actual column name
//$spCriteria = self::$criteria2PeerMap[$criteria['criteria']]; $spCriteria = self::$criteria2PeerMap[$criteria['criteria']];
$spCriteria = $criteria['criteria']; //$spCriteria = $criteria['criteria'];
$spCriteriaModifier = $criteria['modifier']; $spCriteriaModifier = $criteria['modifier'];
$spCriteriaValue = $criteria['value']; $spCriteriaValue = $criteria['value'];
if ($spCriteriaModifier == "starts with") { if ($spCriteriaModifier == "starts with") {
$spCriteriaValue = "$spCriteriaValue%"; $spCriteriaValue = "$spCriteriaValue%";
} else if ($spCriteriaModifier == "ends with") { } else if ($spCriteriaModifier == "ends with") {
$spCriteriaValue = "%$spCriteriaValue"; $spCriteriaValue = "%$spCriteriaValue";
} else if ($spCriteriaModifier == "contains") {
$spCriteriaValue = "%$spCriteriaValue%";
} else if ($spCriteriaModifier == "is in the range") { } else if ($spCriteriaModifier == "is in the range") {
$spCriteriaValue = "$spCriteria > '$spCriteriaValue' AND $spCriteria < '$criteria[extra]'"; $spCriteriaValue = "$spCriteria > '$spCriteriaValue' AND $spCriteria < '$criteria[extra]'";
} }
$spCriteriaModifier = self::$modifier2CriteriaMap[$spCriteriaModifier]; $spCriteriaModifier = self::$modifier2CriteriaMap[$spCriteriaModifier];
try{ try{
//$qry->filterBy($spCriteria, $spCriteriaValue, $spCriteriaModifier);
$qry->filterBy($spCriteria, $spCriteriaValue, $spCriteriaModifier); $qry->filterBy($spCriteria, $spCriteriaValue, $spCriteriaModifier);
}catch (Exception $e){ }catch (Exception $e){
Logging::log($e); Logging::log($e);
@ -1093,15 +1096,14 @@ class Application_Model_Playlist
$limits['time'] = $storedCrit['limit']['modifier'] == "hours" ? intval($storedCrit['limit']['value']) * 60 * 60 : intval($storedCrit['limit']['value'] * 60); $limits['time'] = $storedCrit['limit']['modifier'] == "hours" ? intval($storedCrit['limit']['value']) * 60 * 60 : intval($storedCrit['limit']['value'] * 60);
$limits['items'] = null; $limits['items'] = null;
} }
Logging::log("2222");
try{ try{
$out = $qry->find(); $out = $qry->find();
Logging::log("3333"); Logging::log($qry->toString());
$files = array(); $files = array();
foreach ($out as $file) { foreach ($out as $file) {
$files[$file->getDbId()] = Application_Common_DateHelper::calculateLengthInSeconds($file->getDbLength()); $files[$file->getDbId()] = Application_Common_DateHelper::calculateLengthInSeconds($file->getDbLength());
} }
Logging::log($files); //Logging::log($files);
return array("files"=>$files, "limit"=>$limits); return array("files"=>$files, "limit"=>$limits);
}catch(Exception $e){ }catch(Exception $e){
Logging::log($e); Logging::log($e);