Index: trunk/install/perl/xmltv2foltia.pl
===================================================================
--- trunk/install/perl/xmltv2foltia.pl (リビジョン 111)
+++ trunk/install/perl/xmltv2foltia.pl (リビジョン 120)
@@ -224,6 +224,8 @@
 $foltiaendtime   = substr($foltiaendtime,0,12); # 12桁　200508072355
 
-$sth = $dbh->prepare($stmt{'xmltv2foltia.replaceepg.1'});
-$sth->execute($foltiastarttime , $foltiaendtime , $ontvepgchannel);
+#$sth = $dbh->prepare($stmt{'xmltv2foltia.replaceepg.1'});
+my $now = &epoch2foldate(time());
+$sth = $dbh->prepare( "SELECT * FROM foltia_epg WHERE enddatetime > ? AND startdatetime < ? AND ontvchannel = ? AND startdatetime > ?");
+$sth->execute($foltiastarttime , $foltiaendtime , $ontvepgchannel,$now);
 
 while (@data = $sth->fetchrow_array()) {
Index: trunk/install/php/viewepg.php
===================================================================
--- trunk/install/php/viewepg.php (リビジョン 119)
+++ trunk/install/php/viewepg.php (リビジョン 120)
@@ -19,5 +19,5 @@
 include("./foltialib.php");
 $con = m_connect();
-
+$epgviewstyle = 1;// 0だと終了時刻も表示
 if ($useenvironmentpolicy == 1){
 	if (!isset($_SERVER['PHP_AUTH_USER'])) {
@@ -152,5 +152,5 @@
 /////////////////////////////////////////////////////////////////
 //表示部分
-print "
+$navigationbar =  "
 
 [<A HREF=\"./viewepg.php\">現在</A>] | 
@@ -174,4 +174,5 @@
 <A HREF=\"./viewepg.php?p=$page&start=$day6after\">$day6</A> | 
 <A HREF=\"./viewepg.php?p=$page&start=$day7after\">$day7</A> | <BR>\n";
+print "$navigationbar";
 ///////////////////////////////////////////////////////////////////
 
@@ -274,4 +275,12 @@
 $desc = $stationrowdata[4];
 $desc = htmlspecialchars(z2h($desc));
+
+if ($epgviewstyle){
+$desc=$desc ."<br><br><!-- ". htmlspecialchars(foldate2print($stationrowdata[1])) ."-->";
+}else{
+$desc=$desc ."<br><br>". htmlspecialchars(foldate2print($stationrowdata[1])) ;
+}
+
+
 $height =  htmlspecialchars($stationrowdata[2]) * 3;
 $epgid =  htmlspecialchars($stationrowdata[7]);
@@ -360,6 +369,6 @@
 print "</table>\n";
 
- ?>
-
+print "<p align=\"left\"> $navigationbar </p>";
+?>
 <hr>
 凡例