# HG changeset patch
# User Sushi-k <epgrec@park.mda.or.jp>
# Date 1267519350 -32400
# Node ID f6b909678e51bcc3b0b158aa03e502a51f8c2390
# Parent  c29d41d0c945313e4e85ff06ff3dbda2fd453bb2
fix: CSとBSを合計するとチューナー数以上の重複予約が出来てしまうバグを修正

diff -r c29d41d0c945 -r f6b909678e51 Reservation.class.php
--- a/Reservation.class.php	Mon Mar 01 17:46:03 2010 +0900
+++ b/Reservation.class.php	Tue Mar 02 17:42:30 2010 +0900
@@ -78,8 +78,10 @@
 			
 			// ��√��篋�膣���� = 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 @@
 					// 茹ｆ�������純�����茲����������������茯帥�鴻��
 					// ���緇����篋�膣����
 					$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 @@
 					
 					// ��翫�������牙�私��膣����荀�篁�������
 					$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 @@
 			%TITLE%	���腟���帥�ゃ�����
 			%ST%	���紮���ユ��鐚�ex.200907201830)
 			%ET%	腟�篋���ユ��
-			%TYPE%	GR/BS
+			%TYPE%	GR/BS/CS
 			%CH%	�����ｃ�潟�����������
 			%DOW%	�����ワ��Sun-Mon鐚�
 			%DOWJ%	�����ワ�����-���鐚�