番組表をservice_id順に変更

stz2012 · Aug 3, 2012 · a3c4e3a · a3c4e3a
1 parent 66c1ec5
commit a3c4e3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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 {
 			// 存在した場合も、とりあえずチャンネル名は更新する