category fix, EPG reget fix

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@949 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rectool/trunk/rectool.pl b/rectool/trunk/rectool.pl
index 93f7e8b..d3e9ae1 100755 (executable)
--- a/rectool/trunk/rectool.pl
+++ b/rectool/trunk/rectool.pl
@@ -278,7 +278,9 @@ tie %category, 'Tie::IxHash';
        'documentary' => { name => 'ドキュメンタリー・教養'  , color => '#0000ff' }, 
        'stage'       => { name => '演劇'                    , color => '#8000ff' }, 
        'hobby'       => { name => '趣味・実用'              , color => '#ff00ff' }, 
        'documentary' => { name => 'ドキュメンタリー・教養'  , color => '#0000ff' }, 
        'stage'       => { name => '演劇'                    , color => '#8000ff' }, 
        'hobby'       => { name => '趣味・実用'              , color => '#ff00ff' }, 

-       'etc'         => { name => 'その他'                  , color => '#ff0080' }, 
+       'welfare'     => { name => '福祉'                    , color => '#ff0080' }, 
+       'reserved'    => { name => '予備'                    , color => '#808080' }, 
+       'etc'         => { name => 'その他'                  , color => '#808080' }, 

 );
 
 ################ 初期化ここまで ################
 );
 
 ################ 初期化ここまで ################


@@ -1901,11 +1903,11 @@ if ( $mode eq 'expert' ) {
        $HTML .= qq {<input type="hidden" name="mode_sub" value="reget">\n};
        $HTML .= qq {<select name="bctype">\n};
        $ary_ref = $dbh->selectall_arrayref(
        $HTML .= qq {<input type="hidden" name="mode_sub" value="reget">\n};
        $HTML .= qq {<select name="bctype">\n};
        $ary_ref = $dbh->selectall_arrayref(

-               "SELECT chname, bctype 
+               "SELECT DISTINCT bctype 

                FROM epg_ch WHERE bctype NOT LIKE '_s%' "
        );
        foreach my $line ( @{$ary_ref} ) {
                FROM epg_ch WHERE bctype NOT LIKE '_s%' "
        );
        foreach my $line ( @{$ary_ref} ) {

-               $HTML .= qq {<option value="$line->[1]">$line->[1]</option>\n};
+               $HTML .= qq {<option value="$line->[0]">$line->[0]</option>\n};

        }
        $HTML .= qq {<option value="bs">BS</option>\n};
        $HTML .= qq {<option value="cs1">CS1</option>\n};
        }
        $HTML .= qq {<option value="bs">BS</option>\n};
        $HTML .= qq {<option value="cs1">CS1</option>\n};