Index: trunk/install/perl/db/Pg.pl
===================================================================
--- trunk/install/perl/db/Pg.pl (リビジョン 121)
+++ trunk/install/perl/db/Pg.pl (リビジョン 122)
@@ -74,4 +74,5 @@
 
 'xmltv2foltia.replaceepg.1' => "SELECT * FROM foltia_epg WHERE enddatetime > ? AND startdatetime < ? AND ontvchannel = ? AND startdatetime > ?",
+'xmltv2foltia.replaceepg.2' => "SELECT * FROM foltia_epg WHERE startdatetime = ? AND enddatetime = ? AND ontvchannel = ? ",
 'xmltv2foltia.commitdb.1' => "DELETE FROM foltia_epg WHERE epgid = ?",
 'xmltv2foltia.commitdb.2' => "INSERT INTO foltia_epg VALUES ( nextval('foltia_epg_epgid_seq'), ?, ?, ?, ?, ?, ?, ?)" ,
Index: trunk/install/perl/xmltv2foltia.pl
===================================================================
--- trunk/install/perl/xmltv2foltia.pl (リビジョン 121)
+++ trunk/install/perl/xmltv2foltia.pl (リビジョン 122)
@@ -127,6 +127,6 @@
 	chomp();
 	$item{title}  = &removetag($_);
-	$item{title} =~ s/【.*】//g;#【解】とか
-	$item{title} =~ s/\[.*\]//g;#[二]とか 
+	$item{title} =~ s/【.*?】//g;#【解】とか
+	$item{title} =~ s/\[.*?\]//g;#[二]とか 
 	#print Dumper($_) ;
 	#print "$result  \n";
@@ -232,4 +232,13 @@
 	#&writelog("xmltv2foltia DEBUG push(\@deleteepgid,$data[0]);");
 }#end while 
+
+#上書きを消す
+$sth = $dbh->prepare($stmt{'xmltv2foltia.replaceepg.2'});
+$sth->execute($foltiastarttime , $foltiaendtime , $ontvepgchannel);
+while (@data = $sth->fetchrow_array()) {
+	push(@deleteepgid,$data[0]);
+	#&writelog("xmltv2foltia DEBUG push(\@deleteepgid,$data[0]);");
+}#end while 
+
 }#endsub replaceepg
 
@@ -241,4 +250,8 @@
 my $desc = $_[4];
 my $category = $_[5];
+
+#Encode::JP::H2Z::z2h(\$string);
+$title = jcode($title)->tr('Ａ-Ｚａ-ｚ０-９！＃＄％＆（）＊＋，−．／：；＜＝＞？＠［＼］＾＿｀｛｜｝','A-Za-z0-9!#$%&()*+,-./:;<=>?@[\]^_`{|}');
+$desc = jcode($desc)->tr('Ａ-Ｚａ-ｚ０-９！＃＄％＆（）＊＋，−．／：；＜＝＞？＠［＼］＾＿｀｛｜｝','A-Za-z0-9!#$%&()*+,-./:;<=>?@[\]^_`{|}');
 
 #&writelog("xmltv2foltia DEBUG $foltiastarttime:$foltiaendtime");
@@ -288,5 +301,5 @@
 	$sth = $dbh->prepare($stmt{'xmltv2foltia.commitdb.1'});
 	$sth->execute( $delid ) || warn "$delid\n";
-#	&writelog("xmltv2foltia DEBUG : DELETE FROM foltia_epg WHERE epgid = $delid");
+	#&writelog("xmltv2foltia DEBUG $stmt{'xmltv2foltia.commitdb.1'}/$delid");
 }
 #追加
@@ -294,5 +307,5 @@
 	$sth = $dbh->prepare($stmt{'xmltv2foltia.commitdb.2'});
 	$sth->execute( $foltiastarttime[$i],$foltiaendtime[$i], $lengthmin[$i], $channel[$i], $title[$i], $desc[$i], $category[$i]) || warn "error: $foltiastarttime, $foltiaendtime, $lengthmin, $channel, $title, $desc, $category\n";
-#&writelog("xmltv2foltia DEBUG : INSERT INTO foltia_epg VALUES ( NULL , $foltiastarttime[$i],$foltiaendtime[$i], $lengthmin[$i], $channel[$i], $title[$i], $desc[$i], $category[$i])");
+	#&writelog("xmltv2foltia DEBUG $stmt{'xmltv2foltia.commitdb.2'}/$foltiastarttime[$i],$foltiaendtime[$i], $lengthmin[$i], $channel[$i], $title[$i], $desc[$i], $category[$i]");
 }# end for
 $dbh->commit;
Index: trunk/install/php/reserveepg.php
===================================================================
--- trunk/install/php/reserveepg.php (リビジョン 94)
+++ trunk/install/php/reserveepg.php (リビジョン 122)
@@ -201,4 +201,5 @@
 </table>
 
+<input type=\"hidden\" name=\"epgid\" value=\"$epgid\" />
 <input type=\"hidden\" name=\"stationid\" value=\"$stationid\" />
 <input type=\"hidden\" name=\"subtitle\" value=\"$progname $progdesc\" />
Index: trunk/install/php/reserveepgcomp.php
===================================================================
--- trunk/install/php/reserveepgcomp.php (リビジョン 94)
+++ trunk/install/php/reserveepgcomp.php (リビジョン 122)
@@ -52,11 +52,12 @@
 <?php
 
-$stationid = getnumform(stationid);
+/* $stationid = getnumform(stationid);
 $subtitle = getform(subtitle);
 $startdatetime = getnumform(startdatetime);
 $enddatetime = getnumform(enddatetime);
-$lengthmin = getnumform(lengthmin);
+$lengthmin = getnumform(lengthmin); */
+$epgid = getnumform(epgid);
 
-		if ($stationid == "" || $startdatetime < 0 ||  $enddatetime < 0 || $lengthmin < 0) {
+		if ($epgid == "" ) {
 		print "	<title>foltia:EPG予約:Error</title></head>\n";
 		die_exit("登録番組がありません<BR>");
@@ -65,4 +66,25 @@
 </head>\n";
 $now = date("YmdHi");   
+//タイトル取得
+	$query = "
+	SELECT epgid,startdatetime,enddatetime,lengthmin, ontvchannel,epgtitle,epgdesc,epgcategory , 
+	stationname , stationrecch ,stationid 
+	FROM foltia_epg , foltia_station 
+	WHERE epgid = ? AND foltia_station.ontvcode = foltia_epg.ontvchannel
+	";
+	$rs = sql_query($con, $query, "DBクエリに失敗しました",array($epgid));
+$rowdata = $rs->fetch();
+if (! $rowdata) {
+		die_exit("登録番組がありません。もう一度EPGに戻り操作して下さい。<BR>");
+}else{
+$stationid = $rowdata[10];
+$subtitle = $rowdata[5] . $rowdata[6];
+$startdatetime = $rowdata[1];
+$enddatetime = $rowdata[2];
+$lengthmin = $rowdata[3];
+}
+
+
+
 // - DB登録作業
 
@@ -147,13 +169,11 @@
 
 
-print "<table width=\"100%\" border=\"0\">
-    <tr><td>放送開始</td><td>$startdatetime</td></tr>
-    <tr><td>放送終了</td><td>$enddatetime</td></tr>
-    <tr><td>局コード</td><td>$stationid</td></tr>
-    <tr><td>尺(分)</td><td>$lengthmin</td></tr>
-    <tr><td>番組名</td><td>$subtitle</td></tr>
-	
-</tbody>
-</table>";
+print "<table width=\"100%\" border=\"0\">\n";
+print "<tr><td>放送開始</td><td>".htmlspecialchars($startdatetime)."</td></tr>";
+print "<tr><td>放送終了</td><td>".htmlspecialchars($enddatetime)."</td></tr>\n";
+print "<tr><td>局コード</td><td>".htmlspecialchars($stationid)."</td></tr>\n";
+print "<tr><td>尺(分)</td><td>".htmlspecialchars($lengthmin)."</td></tr>\n";
+print "<tr><td>番組名</td><td>".htmlspecialchars($subtitle)."</td></tr>\n";
+print "</tbody>\n</table>";
 
 ?>