From f5eff4c43464a4a9881c6f97423dfb73c8327a1c Mon Sep 17 00:00:00 2001
From: Sushi-k <epgrec@park.mda.or.jp>
Date: Tue, 2 Mar 2010 17:42:30 +0900
Subject: [PATCH] =?utf8?q?fix:=20CS=E3=81=A8BS=E3=82=92=E5=90=88=E8=A8=88?=
 =?utf8?q?=E3=81=99=E3=82=8B=E3=81=A8=E3=83=81=E3=83=A5=E3=83=BC=E3=83=8A?=
 =?utf8?q?=E3=83=BC=E6=95=B0=E4=BB=A5=E4=B8=8A=E3=81=AE=E9=87=8D=E8=A4=87?=
 =?utf8?q?=E4=BA=88=E7=B4=84=E3=81=8C=E5=87=BA=E6=9D=A5=E3=81=A6=E3=81=97?=
 =?utf8?q?=E3=81=BE=E3=81=86=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Reservation.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Reservation.class.php b/Reservation.class.php
index f01f31e..ddb24fe 100755
--- a/Reservation.class.php
+++ b/Reservation.class.php
@@ -78,8 +78,10 @@ class Reservation {
 			
 			// 既存予約数 = TUNER番号
 			$tuners = ($crec->type == "GR") ? $settings->gr_tuners : $settings->bs_tuners;
+			$type_str = ($crec->type == "GR") ? "type = 'GR' " : "(type = 'BS' OR type = 'CS') ";
+			
 			$battings = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' ".
-															  "AND type = '".$crec->type."' ".
+															  "AND ".$type_str.
 															  "AND starttime < '".toDatetime($end_time) ."' ".
 															  "AND endtime > '".toDatetime($rec_start)."'"
 			);
@@ -90,11 +92,11 @@ class Reservation {
 					// 解消可能な重複かどうかを調べる
 					// 前後の予約数
 					$nexts = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' ".
-																	"AND type = '".$crec->type."' ".
+																	"AND ".$type_str.
 																	"AND starttime = '".toDatetime($end_time - $settings->former_time)."'");
 					
 					$prevs = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' ".
-																"AND type = '".$crec->type."' ".
+																"AND ".$type_str.
 																"AND endtime = '".$starttime."'"  );
 					
 					// 前後を引いてもチューナー数と同数以上なら重複の解消は無理
@@ -111,7 +113,7 @@ class Reservation {
 					
 					// 直前の録画予約を見付ける
 					$trecs = DBRecord::createRecords(RESERVE_TBL, "WHERE complete = '0' ".
-																		 "AND type = '".$crec->type."' ".
+																		 "AND ".$type_str.
 																		 "AND endtime = '".$starttime."'" );
 					// 直前の番組をずらす
 					for( $i = 0; $i < count($trecs) ; $i++ ) {
@@ -182,7 +184,7 @@ class Reservation {
 			%TITLE%	番組タイトル
 			%ST%	開始日時（ex.200907201830)
 			%ET%	終了日時
-			%TYPE%	GR/BS
+			%TYPE%	GR/BS/CS
 			%CH%	チャンネル番号
 			%DOW%	曜日（Sun-Mon）
 			%DOWJ%	曜日（日-土）
-- 
2.11.0