From 7e50a11195e1fe69f10e21ecff5e9b08c56a76c1 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Wed, 22 Aug 2012 16:01:50 -0400
Subject: [PATCH] CC-4225: Smart playlists: Sample and bit rate ranges should
 include entered values

-fixed
---
 airtime_mvc/application/forms/SmartBlockCriteria.php | 4 ++--
 airtime_mvc/application/models/Block.php             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 0e68f957a..8d2e9683d 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -4,7 +4,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
     private $criteriaOptions = array(
             0 => "Select criteria",
             "album_title" => "Album",
-            "bit_rate" => "Bit Rate",
+            "bit_rate" => "Bit Rate (Kbps)",
             "bpm" => "Bpm",
             "comments" => "Comments",
             "composer" => "Composer",
@@ -23,7 +23,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             "name" => "Name",
             "orchestra" => "Orchestra",
             "rating" => "Rating",
-            "sample_rate" => "Sample Rate",
+            "sample_rate" => "Sample Rate (kHz)",
             "track_title" => "Title",
             "track_number" => "Track Number",
             "utime" => "Uploaded",
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index ea4b71d92..a7b39869e 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -1162,7 +1162,7 @@ EOT;
                             $spCriteria = 'date('.$spCriteria.')';
                             $spCriteriaValue = substr($spCriteriaValue, 0, 10);
                         }
-                    } else if($spCriteria == "bit_rate") {
+                    } else if($spCriteria == "bit_rate" || $spCriteria == 'sample_rate') {
                         // multiply 1000 because we store only number value
                         // e.g 192kps is stored as 192000
                         $spCriteriaValue = $criteria['value']*1000;
@@ -1177,7 +1177,7 @@ EOT;
                     } else if ($spCriteriaModifier == "contains" || $spCriteriaModifier == "does not contain") {
                         $spCriteriaValue = "%$spCriteriaValue%";
                     } 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];