X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=blobdiff_plain;f=rectool%2Ftrunk%2Frectool.pl;h=c6fe5890ad87314ce1342749cdbc322cd21a21eb;hp=940a2645c73775d433132c039219a4286b5e0ff8;hb=743f2a98bb09e8637e50166fd06f222538acac23;hpb=dd0c34a29684eb5107f94364c2a987df49e2c028

diff --git a/rectool/trunk/rectool.pl b/rectool/trunk/rectool.pl
index 940a264..c6fe589 100755
--- a/rectool/trunk/rectool.pl
+++ b/rectool/trunk/rectool.pl
@@ -14,12 +14,12 @@ use Archive::Zip;
 use CGI;
 use CGI::Carp qw( fatalsToBrowser warningsToBrowser );
 use Config::Simple;
-use Data::Dumper;
+use Data::Dumper::Concise;
 use Date::Simple;
 use DateTime;
 use DBI;
-use MIME::Base64;
 use File::Slurp;
+use MIME::Base64;
 use Sort::Naturally;
 use Time::Piece;
 use Time::Seconds;
@@ -1143,12 +1143,9 @@ if ( $mode eq 'list' ) {
 	$HTML .= qq {<div>\n};
 
 	$script = <<EOM;
-		<link rel="stylesheet" type="text/css" href="http://extjs-public.googlecode.com/svn/tags/extjs-3.4.0/release/resources/css/ext-all.css" />
-		<script type="text/javascript" src="http://extjs-public.googlecode.com/svn/tags/extjs-3.4.0/release/adapter/ext/ext-base.js"></script>
-		<script type="text/javascript" src="http://extjs-public.googlecode.com/svn/tags/extjs-3.4.0/release/ext-all.js"></script>
-		<style type="text/css">
-			.x-tip-body { font-size: 16px; }
-		</style>
+		<link rel="stylesheet" type="text/css" href="http://cdn.sencha.io/ext-3.4.0/resources/css/ext-all.css" />
+		<script type="text/javascript" src="http://cdn.sencha.io/ext-3.4.0/adapter/ext/ext-base.js"></script>
+		<script type="text/javascript" src="http://cdn.sencha.io/ext-3.4.0/ext-all.js"></script>
 		<script>
 		Ext.onReady(function() {
 		  Ext.select('.ffmpeg').on('contextmenu', function(eventObj, elRef) {
@@ -1348,18 +1345,12 @@ EOM
 	}
 
 	sub simple_list {
-		require Encode;
-
 		local $path = shift;
 		local @list = ();
 
 		&get_file_list_wrapper( $path, \&simple_wanted );
 
-#		@list = sort @list;
-		# natural sortを行う
-			#@list = map( Encode::decode_utf8( $_ ), @list );
-			@list = nsort @list;
-			#@list = map( Encode::encode_utf8( $_ ), @list );
+		@list = nsort @list;
 
 		foreach ( @list ) {
 			$HTML .= "$_<br>\n";
@@ -1933,7 +1924,7 @@ if ( $mode eq 'test' ) {
 	$HTML =~ s|%REFRESH%|<meta http-equiv="refresh" content="300">|;
 	$HTML .= qq {<div>\n};
 
-	require Data::Dumper;
+	require Data::Dumper::Concise;
 	$tmp = read_file( '/etc/rec10.conf' );
 	$tmp =~ s/\n/<br>\n/gs;
 	$HTML .= $tmp;
@@ -2171,6 +2162,7 @@ sub parse_program {
 	$bayesid = $params{ 'bayesid' };
 	$id      = $params{ 'id' };
 
+	# chtxt と chname を相互に補完
 	if ( $chname ) {
 		$chtxt = $dbh->selectrow_array("SELECT chtxt FROM epg_ch WHERE chname = '$chname'");
 	}
@@ -2182,6 +2174,8 @@ sub parse_program {
 	elsif ( $chtxt ) {
 		$chname = $dbh->selectrow_array("SELECT chname FROM epg_ch WHERE chtxt = '$chtxt'")
 	}
+
+	# EPGから番組の情報を取得
 	( $title, $desc, $longdesc, $category ) = $dbh->selectrow_array(
 		"SELECT title, exp, longexp, category
 		FROM epg_timeline 
@@ -2375,8 +2369,6 @@ sub str2readable {
 }
 
 sub sqlgetsuggested {
-	require Encode;
-
 	my ( $btime, $etime ) = @_;
 	$deltatime = 3 if ( !$deltatime );