# HG changeset patch
# User epgrec@park.mda.or.jp <yoneda@recorder.localnet.mda.or.jp>
# Date 1267539677 -32400
# Node ID 80cc05b420af2a816166a01f21eb0f88c3555591
# Parent  f6b909678e51bcc3b0b158aa03e502a51f8c2390
fix: $*_CHANNEL_MAPに存在しないチャンネルの番組を取得する際のエラーを修正

diff -r f6b909678e51 -r 80cc05b420af getepg.old.php
--- a/getepg.old.php	Tue Mar 02 17:42:30 2010 +0900
+++ b/getepg.old.php	Tue Mar 02 23:21:17 2010 +0900
@@ -112,12 +112,15 @@
 		// �����ｃ�潟����������若�帥���｢���
 		$num = DBRecord::countRecords( CHANNEL_TBL , "WHERE channel_disc = '" . $disc ."'" );
 		if( $num == 0 ) {
-			// �����ｃ�潟����������若�帥����������������域�鋎����
-			$rec = new DBRecord( CHANNEL_TBL );
-			$rec->type = $type;
-			$rec->channel = $map["$disc"];
-			$rec->channel_disc = $disc;
-			$rec->name = $ch->{'display-name'};
+			// channel disc���������������������蕋���違��
+			if( array_key_exists( $disc, $map ) ) {
+				// �����ｃ�潟����������若�帥����������������域�鋎����
+				$rec = new DBRecord( CHANNEL_TBL );
+				$rec->type = $type;
+				$rec->channel = $map["$disc"];
+				$rec->channel_disc = $disc;
+				$rec->name = $ch->{'display-name'};
+			}
 		}
 		else {
 			// 絖������������翫����������������������������ｃ�潟�������������贋�違�����
@@ -134,7 +137,9 @@
 	// programme ���緇�
 	
 	foreach( $xml->programme as $program ) {
-		$channel_disc = $program['channel']; 
+		$channel_disc = $program['channel'];
+		if( ! array_key_exists( $channel_disc, $map ) ) continue;
+		
 		$channel = $map["$channel_disc"];
 		$starttime = str_replace(" +0900", '', $program['start'] );
 		$endtime = str_replace( " +0900", '', $program['stop'] );
diff -r f6b909678e51 -r 80cc05b420af storeProgram.php
--- a/storeProgram.php	Tue Mar 02 17:42:30 2010 +0900
+++ b/storeProgram.php	Tue Mar 02 23:21:17 2010 +0900
@@ -87,12 +87,14 @@
 		// �����ｃ�潟����������若�帥���｢���
 		$num = DBRecord::countRecords( CHANNEL_TBL , "WHERE channel_disc = '" . $disc ."'" );
 		if( $num == 0 ) {
-			// �����ｃ�潟����������若�帥����������������域�鋎����
-			$rec = new DBRecord( CHANNEL_TBL );
-			$rec->type = $type;
-			$rec->channel = $map["$disc"];
-			$rec->channel_disc = $disc;
-			$rec->name = $ch->{'display-name'};
+			if( array_key_exists( $disc, $map ) ) {
+				// �����ｃ�潟����������若�帥����������������域�鋎����
+				$rec = new DBRecord( CHANNEL_TBL );
+				$rec->type = $type;
+				$rec->channel = $map["$disc"];
+				$rec->channel_disc = $disc;
+				$rec->name = $ch->{'display-name'};
+			}
 		}
 		else {
 			// 絖������������翫����������������������������ｃ�潟�������������贋�違�����
@@ -110,6 +112,8 @@
 	
 	foreach( $xml->programme as $program ) {
 		$channel_disc = $program['channel']; 
+		if( ! array_key_exists( $channel_disc, $map ) ) continue;
+		
 		$channel = $map["$channel_disc"];
 		$starttime = str_replace(" +0900", '', $program['start'] );
 		$endtime = str_replace( " +0900", '', $program['stop'] );