OSDN Git Service
(root)
/
rec10
/
rec10-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update to db ver 102
[rec10/rec10-git.git]
/
rectool
/
trunk
/
rectool.pl
diff --git
a/rectool/trunk/rectool.pl
b/rectool/trunk/rectool.pl
index
c6fe589
..
fa4a478
100755
(executable)
--- a/
rectool/trunk/rectool.pl
+++ b/
rectool/trunk/rectool.pl
@@
-33,7
+33,7
@@
use utf8;
################ バージョン定義 ################
################ バージョン定義 ################
-my $rectool_version = 10
1
;
+my $rectool_version = 10
2
;
################ 初期化ここから ################
################ 初期化ここから ################
@@
-155,16
+155,17
@@
tie %chtxt_0_chname, 'Tie::IxHash';
my $ary_ref = $dbh->selectall_arrayref(
"SELECT chtxt, chname, ch, bctype FROM epg_ch
my $ary_ref = $dbh->selectall_arrayref(
"SELECT chtxt, chname, ch, bctype FROM epg_ch
- WHERE visible = 1"
+ WHERE visible = 1
+ AND chname != ''
+ ORDER BY chtxt"
);
%chtxt_chname = map { $_->[0], $_->[1] } @{$ary_ref};
);
%chtxt_chname = map { $_->[0], $_->[1] } @{$ary_ref};
-# NHK BS 1/2/hiをBS/CSから除外(101-103) - by 2011/04
-# te: 地上波、BSのNHK以外
-# bc: BSのNHK、CS
-my @te_ary = grep $_->[0]=~ /^\d|BS_(?!(10|19)[1-3])/, @{$ary_ref};
-my @bc_ary = grep $_->[0]!~ /^\d|BS_(?!(10|19)[1-3])/, @{$ary_ref};
+# te: 地上波
+# bc: BS、CS
+my @te_ary = grep $_->[0]=~ /^\d/, @{$ary_ref};
+my @bc_ary = grep $_->[0]!~ /^\d/, @{$ary_ref};
# teの操作(まとめる)
foreach my $line ( @te_ary ) {
# teの操作(まとめる)
foreach my $line ( @te_ary ) {
@@
-1808,7
+1809,7
@@
if ( $mode eq 'expert' ) {
$ary_ref = $dbh->selectall_arrayref(
$ary_ref = $dbh->selectall_arrayref(
- "SELECT chname, chtxt, bctype, ch, csch, updatetime, status, visible
+ "SELECT chname, chtxt, bctype, ch, csch,
tsid,
updatetime, status, visible
FROM epg_ch
ORDER BY bctype " );
$HTML .= qq {<hr>\n番組表の更新状況<br>\n};
FROM epg_ch
ORDER BY bctype " );
$HTML .= qq {<hr>\n番組表の更新状況<br>\n};
@@
-1818,6
+1819,7
@@
if ( $mode eq 'expert' ) {
$HTML .= qq {<th>bctype</th>\n};
$HTML .= qq {<th>ch</th>\n};
$HTML .= qq {<th>csch</th>\n};
$HTML .= qq {<th>bctype</th>\n};
$HTML .= qq {<th>ch</th>\n};
$HTML .= qq {<th>csch</th>\n};
+ $HTML .= qq {<th>tsid</th>\n};
$HTML .= qq {<th>最終更新時刻</th>\n};
$HTML .= qq {<th>状態</th>\n};
$HTML .= qq {<th>表示</th>\n};
$HTML .= qq {<th>最終更新時刻</th>\n};
$HTML .= qq {<th>状態</th>\n};
$HTML .= qq {<th>表示</th>\n};
@@
-1826,6
+1828,7
@@
if ( $mode eq 'expert' ) {
$HTML .= qq {<tr>\n};
$HTML .= qq {<td>$status->[0]</td>\n<td>$status->[1]</td>\n<td>$status->[2]</td>\n<td>$status->[3]</td>\n};
$HTML .= qq {<td>$status->[4]</td>\n<td>$status->[5]</td>\n<td>$status->[6]</td>\n<td>$status->[7]</td>\n};
$HTML .= qq {<tr>\n};
$HTML .= qq {<td>$status->[0]</td>\n<td>$status->[1]</td>\n<td>$status->[2]</td>\n<td>$status->[3]</td>\n};
$HTML .= qq {<td>$status->[4]</td>\n<td>$status->[5]</td>\n<td>$status->[6]</td>\n<td>$status->[7]</td>\n};
+ $HTML .= qq {<td>$status->[8]</td>\n};
$HTML .= qq {</tr>\n};
}
$HTML .= qq {</table>\n};
$HTML .= qq {</tr>\n};
}
$HTML .= qq {</table>\n};
@@
-1841,7
+1844,7
@@
if ( $mode eq 'expert' ) {
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->[
0
]</option>\n};
+ $HTML .= qq {<option value="$line->[1]">$line->[
1
]</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};