From 5f673ba6ccebec58799fd273248ef3cd5c0177de Mon Sep 17 00:00:00 2001
From: tslroom <tslroom@hotmail.com>
Date: Fri, 3 Aug 2012 16:27:27 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php            | 7 ++++---
 storeProgram.inc.php | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index b0c685b..c0ffcd6 100644
--- a/index.php
+++ b/index.php
@@ -42,14 +42,15 @@
 	$tvtimes[$i] = date("H", $top_time + 3600 * $i );
 }
 
-
-// 番組表
-$programs = array();
+// チャンネルマップ
 $tmprec = new DBRecord(CHANNEL_TBL);
 $recarr = $tmprec->fetch_array( "type", $type, "id > 0 ORDER BY sid ASC" );
 foreach( $recarr as $val) {
 	$channel_map["{$val['channel_disc']}"] = $val['channel'];
 }
+
+// 番組表
+$programs = array();
 $st = 0;
 $prec = null;
 try {
diff --git a/storeProgram.inc.php b/storeProgram.inc.php
index 3ee59e3..80d1a35 100644
--- a/storeProgram.inc.php
+++ b/storeProgram.inc.php
@@ -35,8 +35,6 @@ function doKeywordReservation() {
 
 function storeProgram( $type, $xmlfile ) {
 	global $settings;
-	
-	// チャンネルマップファイルの準備
 	$map = array();
 	
 	// XML parse
@@ -67,7 +65,7 @@ function storeProgram( $type, $xmlfile ) {
 			// 存在した場合も、とりあえずチャンネル名は更新する
 			$rec = new DBRecord(CHANNEL_TBL, "channel_disc", $disc );
 			$rec->name = $ch->{'display-name'};
-			// BS／CSの場合、チャンネル番号とSIDをチャンネルマップより更新
+			// BS／CSの場合、チャンネル番号とSIDを更新
 			if ( $type == "BS" ||  $type == "CS" )
 			{
 				$rec->channel = $map["$disc"];