From a3c4e3ab07c254926df5194b14673c89e77bb2de Mon Sep 17 00:00:00 2001
From: tslroom <tslroom@hotmail.com>
Date: Fri, 3 Aug 2012 15:22:23 +0900
Subject: [PATCH] =?UTF-8?q?=E7=95=AA=E7=B5=84=E8=A1=A8=E3=82=92service=5Fi?=
 =?UTF-8?q?d=E9=A0=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/index.php b/index.php
index e202030..b0c685b 100644
--- a/index.php
+++ b/index.php
@@ -46,7 +46,7 @@
 // 番組表
 $programs = array();
 $tmprec = new DBRecord(CHANNEL_TBL);
-$recarr = $tmprec->fetch_array( "type", $type );
+$recarr = $tmprec->fetch_array( "type", $type, "id > 0 ORDER BY sid ASC" );
 foreach( $recarr as $val) {
 	$channel_map["{$val['channel_disc']}"] = $val['channel'];
 }
diff --git a/storeProgram.inc.php b/storeProgram.inc.php
index d3d3720..3ee59e3 100644
--- a/storeProgram.inc.php
+++ b/storeProgram.inc.php
@@ -61,9 +61,7 @@ function storeProgram( $type, $xmlfile ) {
 			$rec->channel = $map["$disc"];
 			$rec->channel_disc = $disc;
 			$rec->name = $ch->{'display-name'};
-			// BS／CSの場合、SIDをチャンネルマップより設定
-			if ( $type == "BS" ||  $type == "CS" )
-				$rec->sid = $sid;
+			$rec->sid = $sid;
 		}
 		else {
 			// 存在した場合も、とりあえずチャンネル名は更新する