# HG changeset patch
# User yoneda <yoneda@recorder.localnet.mda.or.jp>
# Date 1257227680 -32400
# Node ID 1033324d7ecc965a377e743d8c70fd1878c9706c
# Parent  25736d81c66d6547a03970ff9b7f66efbeb52b6d# Parent  3d6e7c60689662e5f23b70c4fff9f9c752dedcb1
Merge branch 'origin/testing'

diff -r 3d6e7c606896 -r 1033324d7ecc Settings.class.php
--- a/Settings.class.php	Tue Nov 03 14:51:44 2009 +0900
+++ b/Settings.class.php	Tue Nov 03 14:54:40 2009 +0900
@@ -41,6 +41,9 @@
 			
 			if(defined("GR_TUNERS")) $xml->gr_tuners = GR_TUNERS;
 			else $xml->gr_tuners = 1;
+
+			if(defined("CS_REC_FLG")) $xml->cs_rec_flg = CS_REC_FLG;
+			else $xml->cs_rec_flg = 0;
 			
 			if(defined("USE_KUROBON")) $xml->use_kurobon = USE_KUROBON ? 1 : 0;
 			else $xml->use_kurobon = 0;
diff -r 3d6e7c606896 -r 1033324d7ecc config.php.sample
--- a/config.php.sample	Tue Nov 03 14:51:44 2009 +0900
+++ b/config.php.sample	Tue Nov 03 14:54:40 2009 +0900
@@ -101,6 +101,91 @@
 	);
 }
 
+// 全国用CSデジタルチャンネルマップ
+$CS_CHANNEL_MAP = array(
+	"1002.ontvjapan.com"		=>	"CS2", // 237,	//	"スターｃｈプラス"
+	"1086.ontvjapan.com"		=>	"CS2", // 239,	// "日本映画専門ｃｈＨＤ"
+	"306ch.epgdata.ontvjapan"	=>	"CS2", // 306,	// "フジテレビＣＳＨＤ"
+
+	"100ch.epgdata.ontvjapan"	=>	"CS4", // 100,	// "ｅ２プロモ"
+	"1025.ontvjapan.com"		=>	"CS4", // 256,	// "Ｊスポーツ　ＥＳＰＮ"
+	"1016.ontvjapan.com"		=>	"CS4", // 312,	// "ＦＯＸ"
+	"1018.ontvjapan.com"		=>	"CS4", // 322,	// "スペースシャワーＴＶ"
+	"1046.ontvjapan.com"		=>	"CS4", // 331,	// "カートゥーン　ネット"
+	"194ch.epgdata.ontvjapan"	=>	"CS4", // 194,	// "インターローカルＴＶ"
+	"1213.ontvjapan.com"		=>	"CS4", // 334,	// "トゥーン・ディズニー"
+
+	"1010.ontvjapan.com"		=>	"CS6", // 221,	// "東映チャンネル"
+	"1005.ontvjapan.com"		=>	"CS6", // 222,	// "衛星劇場"
+	"1008.ontvjapan.com"		=>	"CS6", // 223,	// "チャンネルＮＥＣＯ"
+	"1009.ontvjapan.com"		=>	"CS6", // 224,	// "洋画★シネフィル"
+	"1133.ontvjapan.com"		=>	"CS6", // 292,	// "時代劇専門チャンネル"
+	"1003.ontvjapan.com"		=>	"CS6", // 238,	// "スター・クラシック"
+	"1006.ontvjapan.com"		=>	"CS6", // 310,	// "スーパードラマ"
+	"1014.ontvjapan.com"		=>	"CS6", // 311,	// "ＡＸＮ"
+	"1204.ontvjapan.com"		=>	"CS6", // 343,	// "ナショジオチャンネル"
+
+	"1059.ontvjapan.com"		=>	"CS8", // 55,	//  "ショップチャンネル"
+
+	"1217.ontvjapan.com"		=>	"CS10", // 228,	// "ザ・シネマ"
+	"800ch.epgdata.ontvjapan"	=>	"CS10", // 800,	// "スカチャンＨＤ８００"
+	"801ch.epgdata.ontvjapan"	=>	"CS10", // 801,	// "スカチャン８０１"
+	"802ch.epgdata.ontvjapan"	=>	"CS10", // 802,	// "スカチャン８０２"
+
+	"1028.ontvjapan.com"		=>	"CS12", // 260,	// "ゴルフチャンネル"
+	"1092.ontvjapan.com"		=>	"CS12", // 303,	// "テレ朝チャンネル"
+	"1019.ontvjapan.com"		=>	"CS12", // 323,	// "ＭＴＶ"
+	"1024.ontvjapan.com"		=>	"CS12", // 324,	// "ミュージック・エア"
+	"1067.ontvjapan.com"		=>	"CS12", // 352,	// "朝日ニュースター"
+	"1070.ontvjapan.com"		=>	"CS12", // 353,	// "ＢＢＣワールド"
+	"1069.ontvjapan.com"		=>	"CS12", // 354,	// "ＣＮＮｊ"
+	"361ch.epgdata.ontvjapan"	=>	"CS12", // 361,	// "ジャスト・アイ"
+
+	"1041.ontvjapan.com"		=>	"CS14", // 251,	// "Ｊスポーツ　１"
+	"1042.ontvjapan.com"		=>	"CS14", // 252,	// "Ｊスポーツ　２"
+	"1043.ontvjapan.com"		=>	"CS14", // 253,	// "ＪスポーツＰｌｕｓＨ"
+	"1026.ontvjapan.com"		=>	"CS14", // 254,	// "ＧＡＯＲＡ"
+	"1040.ontvjapan.com"		=>	"CS14", // 255,	// "ｓｋｙ・Ａスポーツ＋"
+
+	"305ch.epgdata.ontvjapan"	=>	"CS16", // 305,	// "チャンネル銀河"
+	"1201.ontvjapan.com"		=>	"CS16", // 333,	// "ＡＴ-Ｘ"
+	"1050.ontvjapan.com"		=>	"CS16", // 342,	// "ヒストリーチャンネル"
+	"803ch.epgdata.ontvjapan"	=>	"CS16", // 803,	// "スカチャン８０３"
+	"804ch.epgdata.ontvjapan"	=>	"CS16", // 804,	// "スカチャン８０４"
+	"1207.ontvjapan.com"		=>	"CS16", // 290,	// "ＳＫＹ・ＳＴＡＧＥ"
+
+	"1007.ontvjapan.com"		=>	"CS18", // 240,	// "ムービープラスＨＤ"
+	"1027.ontvjapan.com"		=>	"CS18", // 262,	// "ゴルフネットワーク"
+	"1074.ontvjapan.com"		=>	"CS18", // 314,	// "ＬａＬａ　ＨＤ"
+
+	"1073.ontvjapan.com"		=>	"CS20", // 258,	// "フジテレビ７３９"
+	"1072.ontvjapan.com"		=>	"CS20", // 302,	// "フジテレビ７２１"
+	"1047.ontvjapan.com"		=>	"CS20", // 332,	// "アニマックス"
+	"1062.ontvjapan.com"		=>	"CS20", // 340,	// "ディスカバリー"
+	"1193.ontvjapan.com"		=>	"CS20", // 341,	// "アニマルプラネット"
+
+	"160ch.epgdata.ontvjapan"	=>	"CS22", // 160,	// "Ｃ-ＴＢＳウエルカム"
+	//"1120.ontvjapan.com"		=>	"CS22", // 161,	// "ＱＶＣ"
+	"185ch.epgdata.ontvjapan"	=>	"CS22", // 185,	// "プライム３６５．ＴＶ"
+	"1015.ontvjapan.com"		=>	"CS22", // 293,	// "ファミリー劇場"
+	"3201.ontvjapan.com"		=>	"CS22", // 301,	// "ＴＢＳチャンネル"
+	"1090.ontvjapan.com"		=>	"CS22", // 304,	// "ディズニーチャンネル"
+	"1022.ontvjapan.com"		=>	"CS22", // 325,	// "MUSIC ON! TV"
+	"1045.ontvjapan.com"		=>	"CS22", // 330,	// "キッズステーション"
+	"1076.ontvjapan.com"		=>	"CS22", // 351,	// "ＴＢＳニュースバード"
+
+	"1068.ontvjapan.com"		=>	"CS24", // 257,	// "日テレＧ＋"
+	"5004.ontvjapan.com"		=>	"CS24", // 291,	// "fashion TV"
+	"300ch.epgdata.ontvjapan"	=>	"CS24", // 300,	// "日テレプラス"
+	"1023.ontvjapan.com"		=>	"CS24", // 320,	// "エコミュージックＴＶ"
+	"1208.ontvjapan.com"		=>	"CS24", // 321,	// "Music Japan TV"
+	"2002.ontvjapan.com"		=>	"CS24", // 350,	// "日テレＮＥＷＳ２４"
+	/*
+	"110ch.epgdata.ontvjapan"	=>	"CS22", 110,	// "ワンテンポータル"
+	"101ch.epgdata.ontvjapan"	=>	"CS22", 101,	// "宝塚プロモチャンネル"
+	"147ch.epgdata.ontvjapan"	=>	"CS22", 147,	// "ＣＳ日本番組ガイド"
+	*/
+);
 
 // DBテーブル情報　以下は変更しないでください
 
diff -r 3d6e7c606896 -r 1033324d7ecc getepg.php
--- a/getepg.php	Tue Nov 03 14:51:44 2009 +0900
+++ b/getepg.php	Tue Nov 03 14:54:40 2009 +0900
@@ -23,6 +23,25 @@
   		storeProgram( "BS", $settings->temp_xml );
   		if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data );
   		if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml );
+
+		// CS
+		if ($settings->cs_rec_flg != 0) {
+			$cmdline = "CHANNEL=CS8 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1";
+			exec( $cmdline );
+			$cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml;
+			exec( $cmdline );
+			storeProgram( "CS", $settings->temp_xml );
+			if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data );
+			if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml );
+
+			$cmdline = "CHANNEL=CS24 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1";
+			exec( $cmdline );
+			$cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml;
+			exec( $cmdline );
+			storeProgram( "CS", $settings->temp_xml );
+			if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data );
+			if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml );
+	  	}
   	}
   }
   
@@ -69,11 +88,12 @@
   exit();
   
   function storeProgram( $type, $xmlfile ) {
-	global $BS_CHANNEL_MAP, $GR_CHANNEL_MAP;
+	global $BS_CHANNEL_MAP, $GR_CHANNEL_MAP, $CS_CHANNEL_MAP;
 	// チャンネルマップファイルの準備
 	$map = array();
 	if( $type == "BS" ) $map = $BS_CHANNEL_MAP;
 	else if( $type == "GR") $map = $GR_CHANNEL_MAP;
+	else if( $type == "CS") $map = $CS_CHANNEL_MAP;
 	
 	// XML parse
   	$xml = @simplexml_load_file( $xmlfile );
diff -r 3d6e7c606896 -r 1033324d7ecc index.php
--- a/index.php	Tue Nov 03 14:51:44 2009 +0900
+++ b/index.php	Tue Nov 03 14:54:40 2009 +0900
@@ -47,6 +47,7 @@
  $programs = array();
  if( $type == "BS" ) $channel_map = $BS_CHANNEL_MAP;
  else if( $type == "GR" ) $channel_map = $GR_CHANNEL_MAP;
+ else if( $type == "CS" ) $channel_map = $CS_CHANNEL_MAP;
  $st = 0;
  $prec = new DBRecord(PROGRAM_TBL);
  foreach( $channel_map as $channel_disc => $channel ) {
@@ -151,6 +152,14 @@
 	$types[$i]['link'] = $_SERVER['SCRIPT_NAME'] . "?type=BS&length=".$program_length."&time=".date( "YmdH", $top_time);
 	$types[$i]['name'] = "BS";
 	$i++;
+
+	// CS
+	if ($settings->cs_rec_flg != 0) {
+		$types[$i]['selected'] = $type == "CS" ? 'class="selected"' : "";
+		$types[$i]['link'] = $_SERVER['SCRIPT_NAME'] . "?type=CS&length=".$program_length."&time=".date( "YmdH", $top_time);
+		$types[$i]['name'] = "CS";
+		$i++;
+	}
  }
  if( $settings->gr_tuners != 0 ) {
 	$types[$i]['selected'] = $type == "GR" ? 'class="selected"' : "";
diff -r 3d6e7c606896 -r 1033324d7ecc programTable.php
--- a/programTable.php	Tue Nov 03 14:51:44 2009 +0900
+++ b/programTable.php	Tue Nov 03 14:54:40 2009 +0900
@@ -110,6 +110,15 @@
 		$arr['value'] = "BS";
 		$arr['selected'] = $type == "BS" ? "selected" : "";
 		array_push( $types, $arr );
+
+		// CS
+		if ($settings->cs_rec_flg != 0) {
+			$arr = array();
+			$arr['name'] = "CS";
+			$arr['value'] = "CS";
+			$arr['selected'] = $type == "CS" ? "selected" : "";
+			array_push( $types, $arr );
+		}
 	}
 	
 	$k_station_name = "";
diff -r 3d6e7c606896 -r 1033324d7ecc templates/envSetting.html
--- a/templates/envSetting.html	Tue Nov 03 14:51:44 2009 +0900
+++ b/templates/envSetting.html	Tue Nov 03 14:54:40 2009 +0900
@@ -74,6 +74,15 @@
 <input type="text" name="bs_tuners" value="{$settings->bs_tuners}" size="3" class="required digits" />
 </div>
 
+<h3>CS録画の有無</h3>
+<div class="setting">
+<div class="caption">この設定を「行う」にするとCS放送を加味した動作となります。CS放送を使用しない方は「使わない」に設定してください。</div>
+<select name="cs_rec_flg" id="id_cs_rec_flg" >
+  <option value="0" {if $settings->cs_rec_flg == 0} selected {/if}>行わない</option>
+  <option value="1" {if $settings->cs_rec_flg == 1} selected {/if}>行う</option>
+</select>
+</div>
+
 <h2>録画関連設定</h2>