@@ -191,16 +186,13 @@
\n");
- /* pg_fetch_row で一行取り出す */
- $rowdata = pg_fetch_row($rs, $row);
-
for ($col = 0; $col < $maxcols; $col++) { /* 列に対応 */
echo("".htmlspecialchars($rowdata[$col])."
| \n");
}
echo("\n");
- }
+ } while ($row = $rs->fetch());
}//end if
?>
diff -urNbwB foltia.r91/install/php/folcast.php foltia/install/php/folcast.php
--- foltia.r91/install/php/folcast.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/folcast.php 2009-06-06 19:17:07.000000000 +0900
@@ -50,7 +50,7 @@
$query = "
SELECT foltia_program.tid,foltia_program.title,
-foltia_subtitle.countno , foltia_subtitle.subtitle , foltia_subtitle.startdatetime, foltia_subtitle.pspfilename,foltia_subtitle.lengthmin,foltia_subtitle.enddatetime FROM foltia_subtitle , foltia_program WHERE \"pspfilename\" ~~ 'M%%' AND foltia_program.tid = foltia_subtitle.tid AND foltia_program.tid = $tid
+foltia_subtitle.countno , foltia_subtitle.subtitle , foltia_subtitle.startdatetime, foltia_subtitle.pspfilename,foltia_subtitle.lengthmin,foltia_subtitle.enddatetime FROM foltia_subtitle , foltia_program WHERE \"pspfilename\" LIKE 'M%%' AND foltia_program.tid = foltia_subtitle.tid AND foltia_program.tid = $tid
ORDER BY \"enddatetime\" DESC
offset 0 limit $max
";
@@ -61,13 +61,13 @@
WHERE foltia_program.tid = $tid
";
$titlers = m_query($con, $query, "DBクエリに失敗しました");
- $rowdata = pg_fetch_row($titlers, 0);
+ $rowdata = $titlers->fetch();
$rsstitle = $rowdata[1];
}else{
$query = "
SELECT foltia_program.tid,foltia_program.title,
-foltia_subtitle.countno , foltia_subtitle.subtitle , foltia_subtitle.startdatetime, foltia_subtitle.pspfilename,foltia_subtitle.lengthmin,foltia_subtitle.enddatetime FROM foltia_subtitle , foltia_program WHERE \"pspfilename\" ~~ 'M%%' AND foltia_program.tid = foltia_subtitle.tid ORDER BY \"enddatetime\" DESC
+foltia_subtitle.countno , foltia_subtitle.subtitle , foltia_subtitle.startdatetime, foltia_subtitle.pspfilename,foltia_subtitle.lengthmin,foltia_subtitle.enddatetime FROM foltia_subtitle , foltia_program WHERE \"pspfilename\" LIKE 'M%%' AND foltia_program.tid = foltia_subtitle.tid ORDER BY \"enddatetime\" DESC
offset 0 limit $max
";
$rsstitle = "新規録画";
@@ -96,15 +96,12 @@
print $header;
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
+$rowdata = $rs->fetch();
-if ($maxrows == 0) {
+if (! $rowdata) {
//die_exit("No items");
}else{
-
-for ($row = 0; $row < $maxrows; $row++) {
- $rowdata = pg_fetch_row($rs, $row);
-
+ do {
//$title = mb_convert_encoding($rowdata[1],"UTF-8", "EUC-JP");
$tid = $rowdata[0];
$title = $rowdata[1];
@@ -162,7 +159,7 @@
$item = mb_convert_encoding($item,"UTF-8", "EUC-JP");
print $item ;
-}//for
+ } while ($rowdata = $rs->fetch()); //do
}//if
?>
diff -urNbwB foltia.r91/install/php/foltia_config2.php.template foltia/install/php/foltia_config2.php.template
--- foltia.r91/install/php/foltia_config2.php.template 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/foltia_config2.php.template 2009-06-09 00:04:21.000000000 +0900
@@ -26,10 +26,8 @@
$usedigital = 1;//Friioなどでデジタル録画をするか 1:する 0:しない
// データベース接続設定
- define("DATABASE_NAME", "foltia");
- define("DBHOST", "localhost");
- define("USER_NAME" , "foltia" );
- define("USER_PASSWORD", "passwd" );
+// define("DSN", "pgsql:host=localhost dbname=foltia user=foltia password= ");
+define("DSN", "sqlite:/home/foltia/foltia.sqlite");
// $mylocalip = "192.168.0.177" ; //動いている機械のIPアドレス
diff -urNbwB foltia.r91/install/php/foltialib.php foltia/install/php/foltialib.php
--- foltia.r91/install/php/foltialib.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/foltialib.php 2009-06-06 19:17:07.000000000 +0900
@@ -94,6 +94,7 @@
}
/* LIKE 用の文字列のエスケープ */
+/* unused
function escape_like($sql, $quote = TRUE) {
return ($quote ? "'" : "") .
str_replace(array("\\\\", "%" , "_" ),
@@ -101,6 +102,7 @@
pg_escape_string($sql)) .
($quote ? "'" : "");
}
+*/
/* SQL 文字列のエスケープ */
function escape_string($sql, $quote = FALSE) {
@@ -109,6 +111,7 @@
}
return ($quote ? "'" : "") .
pg_escape_string($sql) .
+ //sqlite_escape_string($sql) .
($quote ? "'" : "");
}
@@ -125,55 +128,52 @@
/* PostgreSQL サーバに接続 */
function m_connect() {
-/* $con = @pg_connect("host=".DBHOST ." dbname=".DATABASE_NAME .
- " user=".USER_NAME .
- " password=".USER_PASSWORD);
-*/
- $con = @pg_pconnect("host=".DBHOST ." dbname=".DATABASE_NAME .
- " user=".USER_NAME .
- " password=".USER_PASSWORD);
-
-
- if (!$con) {
- die_exit("データベースに接続出来ませんでした。");
+ try {
+ $dbh = new PDO(DSN);
+ $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ return($dbh);
+ } catch (PDOException $e) {
+ die_exit($e->getMessage() . ": データベースに接続出来ませんでした。");
}
/* データベースと、PHP の内部文字コードが違う場合 */
- return($con);
}
/* データベースとの接続を切り離す */
- function m_close($con) {
- return @pg_close($con);
+function m_close($dbh) {
+ return null;
}
/* SQL 文を実行 */
- function m_query($con, $query, $errmessage) {
- $rtn = @pg_query($con, $query);
- if (!$rtn) {
+function m_query($dbh, $query, $errmessage) {
+ try {
+ $rtn = $dbh->query($query);
+ return($rtn);
+ } catch (PDOException $e) {
/* エラーメッセージに SQL 文を出すのはセキュリティ上良くない！！ */
$msg = $errmessage . "
\n" .
- @pg_last_error($con) . "
\n" .
+ $e->getMessage() . "
\n" .
+ var_export($e->errorInfo, true) . "
\n" .
"" . htmlspecialchars($query) .
"\n";
- $rtn = @pg_query($con, "rollback");//04.4.8
- m_close($con);
+// $dbh->rollBack();
+ $dbh = null;
die_exit($msg);
}
- return($rtn);
}
/* select した結果をテーブルで表示 */
function m_showtable($rs) {
/* 検索件数 */
- $maxrows = pg_num_rows($rs);
+ $maxrows = 0;
- if ($maxrows == 0) {
+ $rowdata = $rs->fetch();
+ if (! $rowdata) {
echo("データが存在しません
\n");
return 0;
}
/* フィールド数 */
- $maxcols = pg_num_fields($rs);
+ $maxcols = $rs->columnCount();
?>
@@ -182,7 +182,8 @@
/* テーブルのヘッダーを出力 */
for ($col = 1; $col < $maxcols; $col++) {
/* pg_field_name() はフィールド名を返す */
- $f_name = htmlspecialchars(pg_field_name($rs, $col));
+ $meta = $rs->getColumnMeta($col);
+ $f_name = htmlspecialchars($meta["name"]);
echo("| $f_name | \n");
}
?>
@@ -191,10 +192,10 @@
\n");
- /* pg_fetch_row で一行取り出す */
- $rowdata = pg_fetch_row($rs, $row);
/* １列目にリンクを張る */
echo("" .
@@ -203,7 +204,7 @@
echo(" | ".htmlspecialchars($rowdata[$col])."
| \n");
}
echo("\n");
- }
+ } while ($rowdata = $rs->fetch());
?>
@@ -212,8 +213,9 @@
}
/* 指定したコードのデータを表示 */
- function m_viewdata($con, $code) {
+function m_viewdata($dbh, $code) {
/* コードに該当するデータを検索 */
+/*
$query = "
select p.code
,p.name
@@ -224,34 +226,45 @@
,to_char(p.editdate, 'YYYY/MM/DD HH24:MI:SS') as editdate
from inet_profile p left join inet_job s on p.job = s.code
where p.code = $code";
- $rs = m_query($con, $query, "個人情報の取得に失敗しました。");
- if (pg_num_rows($rs) == 0) {
+*/
+ $query = "
+select p.code
+ ,p.name
+ ,p.email
+ ,p.pseudonym
+ ,s.name as job
+ ,p.profile
+ ,datetime(p.editdate) as editdate
+ from inet_profile p left join inet_job s on p.job = s.code
+ where p.code = $code";
+ $rs = m_query($dbh, $query, "個人情報の取得に失敗しました。");
+ $rowdata = $rs->fetch();
+ if (! $rowdata) {
echo("データが存在しません
\n");
return FALSE;
}
/* フィールド数 */
- $maxcols = pg_num_fields($rs);
- /* 先頭行 */
- $rowdata = pg_fetch_row($rs, 0);
+ $maxcols = $rs->columnCount();
?>
- |
+ getColumnMeta(1); ?>
+ |
|
-
+ getColumnMeta($col); ?>
- |
+ |
|
fetch();
+ if (! $rowdata) {
print("番組データがありません
");
}else{
print "\n";
//print "\n";
-for ($row = 0; $row < $maxrows; $row++) {
-
-$rowdata = pg_fetch_row($rs, $row);
-
+ do {
$printstarttime = substr($rowdata[0],8,2) . ":" . substr($rowdata[0],10,2);
$tdclass = "t".substr($rowdata[0],8,2) . substr($rowdata[0],10,2);
$title = htmlspecialchars($rowdata[3]);
@@ -322,7 +332,7 @@
$printstarttime $title $desc($rowdata[0] - $rowdata[1])
\n";
*/
-}//for
+ } while ($rowdata = $rs->fetch());//do
//print "
\n";
print "
\n";
@@ -556,20 +566,22 @@
WHERE foltia_envpolicy.name = '$name'
";
$useraccount = m_query($con, $query, "DBクエリに失敗しました");
- $useraccountrows = pg_num_rows($useraccount);
+ $rowdata = $useraccount->fetch();
+ if (! $rowdata) {
+ header("HTTP/1.0 401 Unauthorized");
+ redirectlogin();
+ }
- if ($useraccountrows == 1 ){
- $rowdata = pg_fetch_row($useraccount, 0);
$memberid = $rowdata[0];
$userclass = $rowdata[1];
$username = $rowdata[2];
$dbpasswd = $rowdata[3];
- }else{
+
+ $rowdata = $useraccount->fetch();
+ if ($rowdata) {
header("HTTP/1.0 401 Unauthorized");
- //print "";
redirectlogin();
- }//end if
-
+ }
// passwdをdbから取りだし
if ($userclass == 0){
@@ -626,15 +638,19 @@
WHERE foltia_envpolicy.name = '$username'
";
$useraccount = m_query($con, $query, "DBクエリに失敗しました");
- $useraccountrows = pg_num_rows($useraccount);
+ $rowdata = $useraccount->fetch();
+ if (! $rowdata) {
+ return (99);
+ }
- if ($useraccountrows == 1 ){
- $rowdata = pg_fetch_row($useraccount, 0);
- //$userclass = $rowdata[1];
- return ($rowdata[1]);
- }else{
- return (99);//エラー
- }//end if
+ $userclass = $rowdata[1];
+
+ $rowdata = $useraccount->fetch();
+ if ($rowdata) {
+ return (99);
+ }
+
+ return ($userclass);
}else{
return (0);//環境ポリシー使わないときはつねに特権モード
@@ -654,15 +670,19 @@
WHERE foltia_envpolicy.name = '$username'
";
$useraccount = m_query($con, $query, "DBクエリに失敗しました");
- $useraccountrows = pg_num_rows($useraccount);
-
- if ($useraccountrows == 1 ){
- $rowdata = pg_fetch_row($useraccount, 0);
- //$userclass = $rowdata[1];
- return ($rowdata[0]);
- }else{
+ $rowdata = $useraccount->fetch();
+ if (! $rowdata) {
return (-1);//エラー
- }//end if
+ }
+
+ $memberid = $rowdata[0];
+
+ $rowdata = $useraccount->fetch();
+ if ($rowdata) {
+ return (-1);
+ }
+
+ return ($memberid);
}else{
return (0);//環境ポリシー使わないときはつねに特権モード
@@ -681,20 +701,23 @@
WHERE foltia_envpolicy.memberid = '$memberid'
";
$useraccount = m_query($con, $query, "DBクエリに失敗しました");
- $useraccountrows = pg_num_rows($useraccount);
-
- if ($useraccountrows == 1 ){
- $rowdata = pg_fetch_row($useraccount, 0);
- return ($rowdata[2]);
- }else{
+ $rowdata = $useraccount->fetch();
+ if (! $rowdata) {
return ("");//エラー
- }//end if
+ }
-}else{
+ $name = $rowdata[2];
+
+ $rowdata = $useraccount->fetch();
+ if ($rowdata) {
return ("");
-}//end if
+ }
+ return ($name);
+ }else{
+ return ("");
+ }//end if
}//end function getmemberid2name
diff -urNbwB foltia.r91/install/php/graytable.css foltia/install/php/graytable.css
--- foltia.r91/install/php/graytable.css 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/graytable.css 2009-05-20 07:16:20.000000000 +0900
@@ -1,4 +1,4 @@
-body * {margin:0px;padding:0px;border:0px;}
+// body * {margin:0px;padding:0px;border:0px;}
body {
color: #555;
diff -urNbwB foltia.r91/install/php/index.php foltia/install/php/index.php
--- foltia.r91/install/php/index.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/index.php 2009-06-06 19:17:07.000000000 +0900
@@ -71,64 +71,51 @@
LIMIT 1000
";
$reservedrssametid = m_query($con, $query, "DBクエリに失敗しました");
- $reservedmaxrowssameid = pg_num_rows($reservedrssametid);
-
- if ($reservedmaxrowssameid > 0 ){
- for ($rrow = 0; $rrow < $reservedmaxrowssameid ; $rrow++) {
- $rowdata = pg_fetch_row($reservedrssametid, $rrow);
+$rowdata = $reservedrssametid->fetch();
+if ($rowdata) {
+ do {
$reservedpidsametid[] = $rowdata[7];
- }
+ } while ($rowdata = $reservedrssametid->fetch());
+
$rowdata = "";
- $rrow = "";
}else{
- $reservedpidsametid = "" ;
+ $reservedpidsametid = array();
}//end if
+$reservedrssametid->closeCursor();
//録画番組検索
$query = "
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.pid
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime as x, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.pid
FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.enddatetime >= '$now'
UNION
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.pid
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.pid
FROM foltia_tvrecord
LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
LEFT OUTER JOIN foltia_program on (foltia_tvrecord.tid = foltia_program.tid )
LEFT OUTER JOIN foltia_station on (foltia_subtitle.stationid = foltia_station.stationid )
WHERE foltia_tvrecord.stationid = 0 AND
-foltia_subtitle.enddatetime >= '$now' ORDER BY \"startdatetime\" ASC
+ foltia_subtitle.enddatetime >= '$now' ORDER BY x ASC
LIMIT 1000
";
$reservedrs = m_query($con, $query, "DBクエリに失敗しました");
- $reservedmaxrows = pg_num_rows($reservedrs);
-
- if ($reservedmaxrows > 0 ){
- for ($rrow = 0; $rrow < $reservedmaxrows ; $rrow++) {
- $rowdata = pg_fetch_row($reservedrs, $rrow);
+$rowdata = $reservedrs->fetch();
+if ($rowdata) {
+ do {
$reservedpid[] = $rowdata[8];
- }
+ } while ($rowdata = $reservedrs->fetch());
}else{
- $reservedpid = "";
+ $reservedpid = array();
}//end if
$mode = getgetform(mode);
@@ -137,49 +124,34 @@
//新番組表示モード
$query = "
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_subtitle.pid ,
-foltia_subtitle.startoffset
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_subtitle.pid, foltia_subtitle.startoffset
FROM foltia_subtitle , foltia_program ,foltia_station
WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.enddatetime >= '$now' AND foltia_subtitle.countno = '1'
ORDER BY foltia_subtitle.startdatetime ASC
LIMIT 1000
";
- $rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
-
}else{
$query = "
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_subtitle.pid ,
-foltia_subtitle.startoffset
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_subtitle.pid, foltia_subtitle.startoffset
FROM foltia_subtitle , foltia_program ,foltia_station
WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.enddatetime >= '$now'
ORDER BY foltia_subtitle.startdatetime ASC
LIMIT 1000
";
- $rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
}//end if
-if ($maxrows == 0) {
+$rs = m_query($con, $query, "DBクエリに失敗しました");
+$rowdata = $rs->fetch();
+if (! $rowdata) {
header("Status: 404 Not Found",TRUE,404);
printtitle();
print "
@@ -210,7 +182,7 @@
columnCount();
?>
@@ -229,10 +201,7 @@
".htmlspecialchars($rowdata[6])."
\n");
echo("\n");
- }
+ } while ($rowdata = $rs->fetch());
?>
diff -urNbwB foltia.r91/install/php/listreserve.php foltia/install/php/listreserve.php
--- foltia.r91/install/php/listreserve.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/listreserve.php 2009-06-06 19:17:07.000000000 +0900
@@ -61,46 +61,32 @@
}
$query = "
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid ,
-foltia_subtitle.epgaddedby ,
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime as x, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.startoffset,
+ foltia_subtitle.pid, foltia_subtitle.epgaddedby,
foltia_tvrecord.digital
FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.enddatetime >= '$now'
UNION
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid ,
-foltia_subtitle.epgaddedby ,
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.startoffset,
+ foltia_subtitle.pid, foltia_subtitle.epgaddedby,
foltia_tvrecord.digital
FROM foltia_tvrecord
LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
LEFT OUTER JOIN foltia_program on (foltia_tvrecord.tid = foltia_program.tid )
LEFT OUTER JOIN foltia_station on (foltia_subtitle.stationid = foltia_station.stationid )
WHERE foltia_tvrecord.stationid = 0 AND
-foltia_subtitle.enddatetime >= '$now' ORDER BY \"startdatetime\" ASC
+ foltia_subtitle.enddatetime >= '$now' ORDER BY x ASC
";
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
//チューナー数
if (getgetnumform(r) != ""){
@@ -121,13 +107,12 @@
録画予約番組放映予定と予約番組名を表示します。
fetch();
+ if (! $rowdata) {
print "番組データがありません
\n";
}else{
-
-
/* フィールド数 */
- $maxcols = pg_num_fields($rs);
+ $maxcols = $rs->columnCount();
?>
@@ -148,10 +133,9 @@
\n");
- /* pg_fetch_row で一行取り出す */
- $rowdata = pg_fetch_row($rs, $row);
+
$pid = htmlspecialchars($rowdata[9]);
$tid = htmlspecialchars($rowdata[0]);
@@ -167,34 +151,22 @@
//オンボードチューナー録画
$query = "
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid ,
-foltia_tvrecord.digital
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.startoffset,
+ foltia_subtitle.pid, foltia_tvrecord.digital
FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.enddatetime > '$rowdata[5]'
AND foltia_subtitle.startdatetime < '$endtime'
UNION
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid ,
-foltia_tvrecord.digital
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.startoffset,
+ foltia_subtitle.pid, foltia_tvrecord.digital
FROM foltia_tvrecord
LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
LEFT OUTER JOIN foltia_program on (foltia_tvrecord.tid = foltia_program.tid )
@@ -205,13 +177,14 @@
";
$rclass = "";
$overlap = m_query($con, $query, "DBクエリに失敗しました");
- $overlapmaxrows = pg_num_rows($overlap);
+ $owrowall = $overlap->fetchAll();
+ $overlapmaxrows = count($owrowall);
if ($overlapmaxrows > ($recunits) ){
$owtimeline = array();
for ($rrow = 0; $rrow < $overlapmaxrows ; $rrow++) {
- $owrowdata = pg_fetch_array($overlap, $rrow);
+ $owrowdata = $owrowall[$rrow];
$owtimeline[ $owrowdata['startdatetime'] ] = $owtimeline[ $owrowdata['startdatetime'] ] +1;
$owrend = calcendtime( $owrowdata['startdatetime'], $owrowdata['lengthmin'] );
@@ -236,17 +209,11 @@
$externalinputs = 1; //現状一系統のみ
$query = "
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid ,
-foltia_tvrecord.digital
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.startoffset,
+ foltia_subtitle.pid, foltia_tvrecord.digital
FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.enddatetime > '$rowdata[5]'
@@ -254,17 +221,11 @@
AND (foltia_station.stationrecch = '0' OR foltia_station.stationrecch = '-1' )
UNION
SELECT
-foltia_program .tid,
-stationname,
-foltia_program .title,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid ,
-foltia_tvrecord.digital
+ foltia_program.tid, stationname, foltia_program.title,
+ foltia_subtitle.countno, foltia_subtitle.subtitle,
+ foltia_subtitle.startdatetime, foltia_subtitle.lengthmin,
+ foltia_tvrecord.bitrate, foltia_subtitle.startoffset,
+ foltia_subtitle.pid, foltia_tvrecord.digital
FROM foltia_tvrecord
LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
LEFT OUTER JOIN foltia_program on (foltia_tvrecord.tid = foltia_program.tid )
@@ -273,16 +234,16 @@
foltia_subtitle.enddatetime > '$rowdata[5]'
AND foltia_subtitle.startdatetime < '$endtime'
AND (foltia_station.stationrecch = '0' OR foltia_station.stationrecch = '-1' )
-
";
$eoverlap = m_query($con, $query, "DBクエリに失敗しました");
- $eoverlapmaxrows = pg_num_rows($eoverlap);
+ $eowrowall = $eoverlap->fetchAll();
+ $eoverlapmaxrows = count($eowrowall);
if ($eoverlapmaxrows > ($externalinputs) ){
$eowtimeline = array();
for ($erow = 0; $erow < $eoverlapmaxrows ; $erow++) {
- $eowrowdata = pg_fetch_array($eoverlap, $erow);
+ $eowrowdata = $eowrowall[$erow];
$eowtimeline[ $eowrowdata['startdatetime'] ] = $eowtimeline[ $eowrowdata['startdatetime'] ] +1;
$eowrend = calcendtime( $eowrowdata['startdatetime'], $eowrowdata['lengthmin'] );
@@ -358,7 +319,7 @@
}
echo("
\n");
echo("\n");
- }
+ } while ($rowdata = $rs->fetch());
?>
@@ -373,29 +334,23 @@
fetch();
+if (! $rowdata) {
//なければなにもしない
}else{
- $maxcols = pg_num_fields($rs);
+ $maxcols = $rs->columnCount();
?>
録画予約番組タイトルを表示します。
@@ -416,10 +371,7 @@
0){
@@ -467,7 +419,7 @@
}
echo("\n");
}//if tid 0
- }//for
+ } while ($rowdata = $rs->fetch());
}//else
?>
diff -urNbwB foltia.r91/install/php/m.php foltia/install/php/m.php
--- foltia.r91/install/php/m.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/m.php 2009-06-06 19:17:07.000000000 +0900
@@ -98,12 +98,8 @@
FROM foltia_station
WHERE stationid = $recstid";
$stationvalid = m_query($con, $query, "DBクエリに失敗しました");
- $stationcount = pg_num_rows($stationvalid);
-
- if ($stationcount == 1){
- $recstationname = pg_fetch_row($stationvalid, 0);
- //valid
- }else{
+ $recstationname = $stationvalid->fetch();
+ if (! $recstationname) {
$errflag = 3;
$errmsg = "放送局設定が異常です。";
}
@@ -128,22 +124,20 @@
//min pidを探す
$query = "SELECT min(pid) FROM foltia_subtitle ";
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
- if ($maxrows == 0){
+ $rowdata = $rs->fetch();
+ if (! $rowdata) {
$insertpid = -1 ;
}else{
- $rowdata = pg_fetch_row($rs, 0);
$insertpid = $rowdata[0];
$insertpid-- ;
}
// next 話数を探す
$query = "SELECT max(countno) FROM foltia_subtitle WHERE tid = 0";
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
- if ($maxrows == 0){
+ $rowdata = $rs->fetch();
+ if (! $rowdata) {
$nextcno = 1 ;
}else{
- $rowdata = pg_fetch_row($rs, 0);
$nextcno = $rowdata[0];
$nextcno++ ;
}
@@ -214,27 +208,25 @@
録画局:
0
UNION
SELECT DISTINCT stationid,stationname,stationrecch ,digitalch
FROM foltia_station
WHERE digitalch > 0
-ORDER BY \"stationid\" ASC";
+ ORDER BY x ASC";
- $stations = m_query($con, $query, "DBクエリに失敗しました");
- $stationcount = pg_num_rows($stations);
-
-if ($stationcount > 0 ){
- for ($row = 0; $row < $stationcount ; $row++) {
- $rowdata = pg_fetch_row($stations, $row);
+$stationcount = $stations->rowCount();
+ $rowdata = $stations->fetch();
+ if ($rowdata) {
+ do {
if ($recstid == $rowdata[0]){
print " $rowdata[1] ($rowdata[2]ch) \n";
}else{
print " $rowdata[1] ($rowdata[2]ch) \n";
}
- }
+ } while ($rowdata = $stations->fetch());
}else{
print "放送局データベースが正しくセットアップされていません。録画可能局がありません";
}
@@ -246,11 +238,9 @@
ORDER BY \"stationid\" ASC";
$stations = m_query($con, $query, "DBクエリに失敗しました");
- $stationcount = pg_num_rows($stations);
-
-if ($stationcount > 0 ){
- for ($row = 0; $row < $stationcount ; $row++) {
- $rowdata = pg_fetch_row($stations, $row);
+$rowdata = $stations->fetch();
+if ($rowdata) {
+ do {
if ($rowdata[0] != 0){
if ($recstid == $rowdata[0]){
print " $rowdata[1] \n";
@@ -259,7 +249,7 @@
}
}
- }
+ } while ($rowdata = $stations->fetch());
}
/*
print "
デジタル録画を優先:";
diff -urNbwB foltia.r91/install/php/reservecomp.php foltia/install/php/reservecomp.php
--- foltia.r91/install/php/reservecomp.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/reservecomp.php 2009-06-06 19:17:07.000000000 +0900
@@ -68,12 +65,10 @@
//タイトル取得
$query = "select title from foltia_program where tid='$tid'";
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
- if ($maxrows == 0) {
+$rowdata = $rs->fetch();
+if (! $rowdata) {
$title = "(未登録)";
}else{
- $rowdata = pg_fetch_row($rs, 0);
$title = htmlspecialchars($rowdata[0]);
}
@@ -129,13 +124,12 @@
}
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
- if ($maxrows == 0) {
+$rowdata = $rs->fetch();
+if (! $rowdata) {
echo("放映予定はいまのところありません
");
}
else{
- $maxcols = pg_num_fields($rs);
+ $maxcols = $rs->columnCount();
?>
@@ -154,16 +148,13 @@
\n");
- /* pg_fetch_row で一行取り出す */
- $rowdata = pg_fetch_row($rs, $row);
-
for ($col = 0; $col < $maxcols; $col++) { /* 列に対応 */
echo("".htmlspecialchars($rowdata[$col])."
| \n");
}
echo("\n");
- }
+ } while ($rowdata = $rs->fetch());
}//end if
?>
@@ -176,33 +167,22 @@
//foltia_tvrecord 書き込み
//既存が予約あって、新着が全局予約だったら
if ($station ==0){
- $query = "
-SELECT
- *
-FROM foltia_tvrecord
-WHERE tid = '$tid'
-";
- $rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
- if ($maxrows > 0){
//既存局を消す
$query = "DELETE
FROM foltia_tvrecord
WHERE tid = '$tid'
";
$rs = m_query($con, $query, "DBクエリに失敗しました");
- }
}//endif
$query = "
SELECT
- *
+count(*)
FROM foltia_tvrecord
WHERE tid = '$tid' AND stationid = '$station'
";
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
+ $maxrows = $rs->fetchColumn(0);
if ($maxrows == 0) { //新規追加
$query = "INSERT INTO foltia_tvrecord values ('$tid','$station','$bitrate','$usedigital')";
$rs = m_query($con, $query, "DB書き込みに失敗しました");
diff -urNbwB foltia.r91/install/php/reserveepg.php foltia/install/php/reserveepg.php
--- foltia.r91/install/php/reserveepg.php 2009-05-17 12:00:12.000000000 +0900
+++ foltia/install/php/reserveepg.php 2009-06-06 19:17:07.000000000 +0900
@@ -58,12 +56,11 @@
WHERE epgid='$epgid' AND foltia_station.ontvcode = foltia_epg.ontvchannel
";//4812
$rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
- if ($maxrows == 0) {
+$rowdata = $rs->fetch();
+if (! $rowdata) {
die_exit("登録番組がありません
");
}
- $rowdata = pg_fetch_row($rs, 0);
+
//$title = htmlspecialchars($rowdata[0]);
?>
@@ -135,17 +132,11 @@
//重複確認
$query = "
SELECT
-foltia_program .title,
-foltia_program .tid,
-stationname,
-foltia_station.stationid ,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid
+ foltia_program.title, foltia_program.tid, stationname,
+ foltia_station.stationid, foltia_subtitle.countno,
+ foltia_subtitle.subtitle, foltia_subtitle.startdatetime,
+ foltia_subtitle.lengthmin, foltia_tvrecord.bitrate,
+ foltia_subtitle.startoffset, foltia_subtitle.pid
FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
AND foltia_subtitle.startdatetime ='$startfoltime'
@@ -153,17 +144,11 @@
AND foltia_station.stationid = '$stationid'
UNION
SELECT
-foltia_program .title,
-foltia_program .tid,
-stationname,
-foltia_station.stationid ,
-foltia_subtitle.countno,
-foltia_subtitle.subtitle,
-foltia_subtitle.startdatetime ,
-foltia_subtitle.lengthmin ,
-foltia_tvrecord.bitrate ,
-foltia_subtitle.startoffset ,
-foltia_subtitle.pid
+ foltia_program.title, foltia_program.tid, stationname,
+ foltia_station.stationid, foltia_subtitle.countno,
+ foltia_subtitle.subtitle, foltia_subtitle.startdatetime,
+ foltia_subtitle.lengthmin, foltia_tvrecord.bitrate,
+ foltia_subtitle.startoffset, foltia_subtitle.pid
FROM foltia_tvrecord
LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
LEFT OUTER JOIN foltia_program on (foltia_tvrecord.tid = foltia_program.tid )
@@ -174,20 +159,16 @@
AND foltia_station.stationid = '$stationid'
";
-
-
- $rs = m_query($con, $query, "DBクエリに失敗しました");
- $maxrows = pg_num_rows($rs);
-
//print "";
print "