チェンジセット 122

コミット日時:

2010/10/07 10:43:38 (14 年前)

コミッタ:

sorshi

ログメッセージ:

EPGのDB格納形式を全角英数から半角英数に変更。
EPGタイトルが消えてしまう不具合修正。
DBへ重複登録されてしまう不具合を修正。

ファイル:

• trunk/install/perl/db/Pg.pl (更新) (1 diff)
• trunk/install/perl/xmltv2foltia.pl (更新) (5 diffs)
• trunk/install/php/reserveepg.php (更新) (1 diff)
• trunk/install/php/reserveepgcomp.php (更新) (3 diffs)

trunk/install/perl/db/Pg.pl

@@ -74 +74 @@
-
-'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'), ?, ?, ?, ?, ?, ?, ?)" ,

trunk/install/perl/xmltv2foltia.pl

@@ -127 +127 @@
-        chomp();
-        $item{title}  = &removetag($_);
-
-
+?
+?
-        #print Dumper($_) ;
-        #print "$result  \n";
@@ -232 +232 @@
-        #&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 +250 @@
-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 +301 @@
-        $sth = $dbh->prepare($stmt{'xmltv2foltia.commitdb.1'});
-        $sth->execute( $delid ) || warn "$delid\n";
-#      &writelog("xmltv2foltia DEBUG : DELETE FROM foltia_epg WHERE epgid = 
+       #&writelog("xmltv2foltia DEBUG $stmt{'xmltv2foltia.commitdb.1'}/
-}
-#追加
@@ -294 +307 @@
-        $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;

trunk/install/php/reserveepg.php

@@ -201 +201 @@
-</table>
-
+<input type=\"hidden\" name=\"epgid\" value=\"$epgid\" />
-<input type=\"hidden\" name=\"stationid\" value=\"$stationid\" />
-<input type=\"hidden\" name=\"subtitle\" value=\"$progname $progdesc\" />

trunk/install/php/reserveepgcomp.php

@@ -52 +52 @@
-<?php
-
-
+/* 
-$subtitle = getform(subtitle);
-$startdatetime = getnumform(startdatetime);
-$enddatetime = getnumform(enddatetime);
-
+
+
-
-stationid == "" || $startdatetime < 0 ||  $enddatetime < 0 || $lengthmin < 0
+epgid == "" 
-                print " <title>foltia:EPG予約:Error</title></head>\n";
-                die_exit("登録番組がありません<BR>");
@@ -65 +66 @@
-</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 +169 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-?>