チェンジセット 83: trunk/install

コミット日時:

2008/12/30 22:12:46 (16 年前)

コミッタ:

sorshi

ログメッセージ:

foltiaHD最初のリリース。
デジタル録画はFriio/Friio BS/CSのみに対応。
ivtvは1.0系使用になりました。

ファイル:

• trunk/install/mktable.txt (更新) (5 diffs)
• trunk/install/perl/addpidatq.pl (更新) (2 diffs)
• trunk/install/perl/captureimagemaker.pl (更新) (2 diffs)
• trunk/install/perl/deletemovie.pl (更新) (1 diff)
• trunk/install/perl/digitaltvrecording.pl (追加)
• trunk/install/perl/foltia_conf1.pl.template (更新) (1 diff)
• trunk/install/perl/foltialib.pl (更新) (2 diffs)
• trunk/install/perl/ipodtranscode.pl (更新) (6 diffs)
• trunk/install/perl/record-v4l2.pl (追加)
• trunk/install/perl/recwrap.pl (更新) (7 diffs)
• trunk/install/perl/tool (追加)
• trunk/install/perl/tvrecording.pl (更新) (9 diffs)
• trunk/install/perl/updatem2pfiletable.pl (更新) (2 diffs)
• trunk/install/php/foltia_config2.php.template (更新) (2 diffs)
• trunk/install/php/img/icon.png (追加)
• trunk/install/php/index.php (更新) (6 diffs)
• trunk/install/php/iui (追加)
• trunk/install/php/listreserve.php (更新) (15 diffs)
• trunk/install/php/m.php (更新) (6 diffs)
• trunk/install/php/reservecomp.php (更新) (2 diffs)
• trunk/install/php/reserveepgcomp.php (更新) (3 diffs)
• trunk/install/php/reserveprogram.php (更新) (2 diffs)
• trunk/install/php/selectcaptureimage.php (更新) (2 diffs)
• trunk/install/php/showlib.php (更新) (6 diffs)
• trunk/install/php/showlibc.php (更新) (10 diffs)
• trunk/install/php/showplaylist.php (更新) (4 diffs)

trunk/install/mktable.txt

@@ +1 @@
+
-drop table  foltia_program ;
-
@@ -33 +34 @@
-m2pfilename text ,
-PSPfilename text ,
-
+
+
+
-);
-create unique index foltia_subtitle_pid_index on foltia_subtitle (pid);
@@ -46 +49 @@
-drop table foltia_tvrecord;
-create table foltia_tvrecord (
- PRIMARY KEY
+
-stationid int8,
-
+
+
-);
-create  index foltia_tvrecord_tid_index on foltia_tvrecord (tid);
@@ -99 +103 @@
-    tunerch text,
-    device text,
-
+
+
+
-);
-REVOKE ALL on "foltia_station" from PUBLIC;
@@ -133 +139 @@
---
-INSERT INTO foltia_program VALUES (0, 'EPG録画', '', '', NULL, '', '', 3, 1, '', '');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/install/perl/addpidatq.pl

@@ -47 +47 @@
- if ($titlecount[0]  == 1 ){
-
-
+,digital
- $sth = $dbh->prepare($DBQuery);
-$sth->execute();
- @titlecount= $sth->fetchrow_array;
-$bitrate = $titlecount[0];#ビットレート取得
+if ($titlecount[1] >= 1){
+        $usedigital = $titlecount[1];#デジタル優先フラグ
+}else{
+        $usedigital = 0;
+}
-
-#PID抽出
-$now = &epoch2foldate(`date +%s`);
-
-
+
+
-
-
-#stationIDからrecch
- $stationh = $dbh->prepare($DBQuery);
-        $stationh->execute();
-@stationl =  $stationh->fetchrow_array;
-$recch = $stationl[0];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-$DBQuery =  "SELECT  * FROM  foltia_subtitle WHERE pid='$pid' ";
- $sth = $dbh->prepare($DBQuery);
@@ -109 +126 @@
-}
-
- $bitrate $tid $countno $pid
- $bitrate $tid $countno $pid
+$bitrate $tid $countno $pid $stationid $usedigital $digitalstationband $digitalch
+$bitrate $tid $countno $pid $stationid $usedigital $digitalstationband $digitalch
-
-}#end #もし新開始時刻が15分移譲先なら再キュー
-
-}else{
- $pid  $startafter  $now 
+$pid $startafter $now
-}#放送が未来の日付なら
-

trunk/install/perl/captureimagemaker.pl

@@ -100 +100 @@
-# $captureimgdir = "$tid"."-"."$countno"."-"."$date"."-"."$time";
-$captureimgdir = $filename;
-
+|\.m2t$
-
-unless (-e "$capimgdirname/$captureimgdir"){
@@ -118 +118 @@
-
-#　10秒ごとに
-
+
+
+
+
+
+
+
-

trunk/install/perl/deletemovie.pl

@@ -32 +32 @@
-
-#ファイル名正当性チェック
-\z
+$|.m2t$
-
-}else{

trunk/install/perl/foltia_conf1.pl.template

@@ -15 +15 @@
-$uhfbandtype = 1; # CATVなら1 UHF帯なら0 : 0=ntsc-bcast-jp 1=ntsc-cable-jp
-$rapidfiledelete =  1;#1なら削除ファイルは「mita」ディレクトリに移動。0なら即時削除
-6
-7
- = 8
+0
+1
+= 2
-$haveirdaunit = 1;#Tira-2<http://www.home-electro.com/tira2.php>をつないでいるときに1,なければ0
-$mp4filenamestyle = 1 ;#0:PSP ファームウェアver.2.80より前と互換性を持つファイル名 1;よりわかりやすいファイル名
-$trconqty = 2;
-
-
-
-
+(古い設定)
+ / デジタル  360x202 24.00fps 300kbps
+ / デジタル 480x272  29.97fps 400kbps
+ / デジタル  640x352 29.97fps 600kbps
-$phptoolpath = $toolpath ;#php版の初期設定の位置。デフォルトではperlと同じ位置
-

trunk/install/perl/foltialib.pl

@@ -22 +22 @@
-         $DBPass="";
-        
+
+
+  $FILESTATUSRESERVINGLONG = 10;
+  $FILESTATUSRESERVINGSHORT = 20;
+  $FILESTATUSRECORDING = 30;
+  $FILESTATUSRECTSSPLITTING = 40;
+  $FILESTATUSRECEND = 50;
+  $FILESTATUSWAITINGCAPTURE = 55;
+  $FILESTATUSCAPTURE = 60;
+  $FILESTATUSCAPEND = 70;
+  $FILESTATUSTHMCREATE = 72;
+  $FILESTATUSWAITINGTRANSCODE = 80;
+  $FILESTATUSTRANSCODETSSPLITTING = 90;
+  $FILESTATUSTRANSCODEFFMPEG = 100;
+  $FILESTATUSTRANSCODEWAVE = 110;
+  $FILESTATUSTRANSCODEAAC = 120;
+  $FILESTATUSTRANSCODEMP4BOX = 130;
+  $FILESTATUSTRANSCODEATOM = 140;
+  $FILESTATUSTRANSCODECOMPLETE = 150;
+  $FILESTATUSALLCOMPLETE = 200;
+
-
-#------------------------------
@@ -258 +279 @@
-
-
+sub getpidbympegfilename {
+#引き数:m2pfilename
+#戻り値:PID
+my $m2pfilename =  $_[0] ;
+if ($m2pfilename eq ""){
+        return  0 ;
+}
+
+my $DBQuery =  "SELECT pid FROM foltia_subtitle WHERE m2pfilename = '$m2pfilename' LIMIT 1 ";
+my $sth;
+$sth = $dbh->prepare($DBQuery);
+$sth->execute();
+#print "$DBQuery\n";
+my @pidinfo = $sth->fetchrow_array;
+my $pid  = $pidinfo[0];
+
+if ($pid eq ""){
+        return  0 ;
+}else{
+        return $pid;
+}
+}#end sub getpidbympegfilename
+
+sub changefilestatus {
+#引き数:PID,updatestatus
+#戻り値:エラーコード
+my $pid =  $_[0] ;
+my $updatestatus = $_[1];
+if (($pid eq "" ) || ($updatestatus eq "")){
+        return  0 ;
+}
+
+if ($updatestatus > 0 ){
+my $DBQuery =  "UPDATE  foltia_subtitle SET filestatus = $updatestatus , lastupdate      = now() WHERE pid = $pid ";
+my $sth;
+$sth = $dbh->prepare($DBQuery);
+$sth->execute();
+return 1;
+}else{
+        &writelog("foltialib changefilestatus ERR Sttus invalid:$updatestatus");
+        return  0 ;
+}
+}# end sub changefilestatus
+
+
+sub getfilestatus {
+#引き数:PID
+#戻り値:ステータス
+
+#10:予約中(5分以上先)
+#20:予約中(5分以内)
+#30:録画中
+#40:TSSplit中
+#50:MPEG2録画終了
+#55 静止画キャプチャ待
+#60:静止画キャプ中
+#70:静止画キャプ終了
+#72:サムネイル作成済み(.THM)
+#80:トラコン待
+#90:トラコン中:TSsplit
+#100:トラコン中:H264
+#110:トラコン中:WAVE
+#120:トラコン中:AAC
+#130:トラコン中:MP4Box
+#140:トラコン中:ATOM
+#150:トラコン完了
+#200:全完了
+my $pid =  $_[0] ;
+if ($pid eq "" ){
+        return  0 ;
+}
+
+my $DBQuery =  "SELECT filestatus FROM foltia_subtitle  WHERE pid = $pid ";
+my $sth;
+$sth = $dbh->prepare($DBQuery);
+$sth->execute();
+
+my @statusinfo = $sth->fetchrow_array;
+my $status  = $statusinfo[0];
+
+if ($status eq ""){
+        return  0 ;
+}else{
+        return $status;
+}
+
+
+}# end sub getfilestatus
+
+
+sub makemp4dir{
+#TIDが100以上の3桁の場合はそのまま
+my $pspfilnamehd = $_[0];
+my $tid = $_[0];
+my $pspdirname = "$tid.localized/";
+$pspdirname = $recfolderpath."/".$pspdirname;
+
+#なければ作る
+unless (-e $pspdirname ){
+        system("$toolpath/perl/mklocalizeddir.pl $tid");
+        #&writelog("recwrap mkdir $pspdirname");
+}
+$pspdirname = "$tid.localized/mp4/";
+$pspdirname = $recfolderpath."/".$pspdirname;
+#なければ作る
+unless (-e $pspdirname ){
+        mkdir $pspdirname ,0777;
+        #&writelog("recwrap mkdir $pspdirname");
+}
+return ("$pspdirname");
+}#endsub makemp4dir
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-1;
-

trunk/install/perl/ipodtranscode.pl

@@ -1 +1 @@
-#!/usr/bin/perl
-/path/to/mpeg2.m2p mp4filenamestring /path/to/mpeg2/tid.localized/mp4/ PID [aspect]
+
-#
-# Anime recording system foltia
-# http://www.dcc-jpl.com/soft/foltia/
-#
-#
-# iPod MPEG4/H.264トラコン
-# ffmpegを呼び出して変換
-# ffmpegはiPodパッチあて版を想定している
-# ffmpegの作り方は
-# http://www.dcc-jpl.com/diary/ddata2006/02A.html#20060215-00
-#
-# DCC-JPL Japan/foltia project
@@ -18 +14 @@
-use DBD::Pg;
-use Jcode;
-
-
-$path = $0;
@@ -25 +20 @@
-push( @INC, "$path");
-}
-
-require "foltialib.pl";
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-#DB初期化
@@ -46 +39 @@
-         $dbh = DBI->connect($data_source,$DBUser,$DBPass) ||die $DBI::error;;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# タイトル取得
-if ($pid ne ""){
@@ -82 +119 @@
-
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# クオリティごとに
-
-
-
+
+
-$mp4file = "${mp4outdir}M4V${mp4filenamestring}.MP4";
-
-
-
-
+
+
+
+
+
+
-$mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
-
-
-
-
+
+
+
+
+
+
-$mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
-
-
-
-
+
+
+
+
+
+
-$mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
-
-
-
-
+
+
+
+
+
+
-$mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
-
-
-
+
+
+
+
+
-
-$encodeoptionlog = $encodeoption;
@@ -122 +347 @@
-&writelog("ipodtranscode START QTY=$trconqty $encodeoptionlog");
-#print "ffmpeg $encodeoptionlog \n";
-
+
+
-&writelog("ipodtranscode FFEND $inputmpeg2");
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/install/perl/recwrap.pl

@@ -1 +1 @@
-#!/usr/bin/perl
- ch length(sec) [bitrate(5)] [TID] [NO]  [PID]
+ch length(sec) [bitrate(5)] [TID] [NO] [PID] [stationid] [digitalflag] [digitalband] [digitalch] 
-#
-# Anime recording system foltia
@@ -39 +39 @@
-$tid  = $ARGV[3] ;
-$countno  = $ARGV[4] ;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$outputfile = `date  +%Y%m%d-%H%M --date "1 min "`;
-chomp($outputfile);
+
-if ($tid == 0){
-".m2p"
+$extension
-                $mp4newstylefilename = "-0--".$outputfile."-".$recch;
-}else{
-        if ($countno == 0){
-".m2p"
+$extension
-                $mp4newstylefilename = "-" . $tid ."--".$outputfile;
-        }else{
-".m2p"
+$extension
-                $mp4newstylefilename = "-" . $tid ."-".$countno."-".$outputfile;
-        }
-}
+
+if ($usedigital == 1){
+#デジタルなら
+&writelog("recwrap RECSTART DIGITAL $digitalstationband $digitalch $reclength $stationid 0 $outputfilename $tid $countno friio");
+#録画
+$starttime = (`date +%s`);
+$oserr = system("$toolpath/perl/digitaltvrecording.pl $digitalstationband $digitalch $reclength $stationid 0 $outputfilename $tid $countno friio");
+$oserr = $oserr / 256;
+
+if ($oserr == 1){
+        &writelog("recwrap ABORT recfile exist. [$outputfilename] $digitalstationband $digitalch $reclength $stationid 0  $outputfilename $tid $countno");
+        exit;
+}elsif ($oserr == 2){
+        &writelog("recwrap ERR 2:friio busy;retry.");
+        &continuousrecordingcheck;#もうすぐ終わる番組をkill
+        sleep(2);
+        $oserr = system("$toolpath/perl/digitaltvrecording.pl $digitalstationband $digitalch $reclength $stationid N $outputfilename $tid $countno friio");
+        $oserr = $oserr / 256;
+        if ($oserr == 2){
+        &writelog("recwrap ERR 2:friio busy;Giving up digital recording.");
+        }
+}elsif ($oserr == 3){
+&writelog("recwrap ABORT:ERR 3");
+exit ;
+}
+}else{
-#リモコン操作
-# $haveirdaunit = 1;リモコンつないでるかどうか確認
@@ -71 +114 @@
-        exit;
-        }#end if
-
-
+
+
+
-#録画
-#system("$toolpath/perl/tvrecording.pl $recch $reclength 0 $outputfile $bitrate $tid $countno");
@@ -83 +127 @@
-        exit;
-}
+
+}#endif #デジタル優先フラグ
+
-#デバイスビジーで即死してないか検出
-$now = (`date +%s`);
-        if ($now < $starttime + 100){ #録画プロセス起動してから100秒以内に戻ってきてたら
+        $retrycounter == 0;
-                while($now < $starttime + 100){
+                        if($retrycounter >= 5){
+                                &writelog("recwrap WARNING  Giving up recording.");
+                                last;
+                        }
-                &writelog("recwrap retry recording $now $starttime");
+                #アナログ録画
-$starttime = (`date +%s`);
+if($outputfilename =~ /.m2t$/){
+        $outputfilename =~ s/.m2t$/.m2p/;
+}
-$oserr = system("$toolpath/perl/tvrecording.pl $recch $reclength N $outputfilename $bitrate $tid $countno");
-$now = (`date +%s`);
@@ -96 +152 @@
-                                exit;
-                        }# if
+                $retrycounter++;
-                }# while
-        } # if 
-
-
-        &writelog("recwrap RECEND [$outputfilename] $recch $reclength 0 0 $bitrate $tid $countno $pid");
-
-#DB初期化
-        my $data_source = sprintf("dbi:%s:dbname=%s;host=%s;port=%d",
-                $DBDriv,$DBName,$DBHost,$DBPort);
-         $dbh = DBI->connect($data_source,$DBUser,$DBPass) ||die $DBI::error;;
-
-# m2pファイル名をPIDレコードに書き込み
-
-
-
+
-         $sth = $dbh->prepare($DBQuery);
-        $sth->execute();
-
+
+
-
-# m2pファイル名をPIDレコードに書き込み
- 
+
-         $sth = $dbh->prepare($DBQuery);
-        $sth->execute();
-UPDATEDB 
+DEBUG UPDATEDB
-
-# Starlight breaker向けキャプチャ画像作成
-if (-e "$toolpath/perl/captureimagemaker.pl"){
-        &writelog("recwrap Call captureimagemaker $outputfilename");
+&changefilestatus($pid,$FILESTATUSCAPTURE);
-        system ("$toolpath/perl/captureimagemaker.pl $outputfilename");
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-         $sth = $dbh->prepare($DBQuery);
-        $sth->execute();
- @psptrcn= $sth->fetchrow_array;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- 
-#TIDが100以上の3桁の場合はそのまま
-my $pspfilnamehd = "";
-
-
+
+
-$pspdirname = "$tid.localized/";
-$pspdirname = $recfolderpath."/".$pspdirname;
-
-#なければ作る
-
-
-
-
+#
+#
+#
+#
-$pspdirname = "$tid.localized/mp4/";
-$pspdirname = $recfolderpath."/".$pspdirname;
-#なければ作る
-
-
-
-
+#
+#
+#
+#
-
-#ファイル名決定
@@ -350 +412 @@
-
-# MP4ファイル名をPIDレコードに書き込み
-
-
-
+
-         $sth = $dbh->prepare($DBQuery);
-        $sth->execute();
@@ -358 +418 @@
-
-# MP4ファイル名をfoltia_mp4files挿入
- "insert into 
+"insert into
-         $sth = $dbh->prepare($DBQuery);
-        $sth->execute();
-&writelog("recwrap UPDATEmp4DB  $DBQuery");
-
+&changefilestatus($pid,200);
-}#PSPトラコンあり
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/install/perl/tvrecording.pl

@@ -5 +5 @@
-#
-#tvrecording.pl
-に準備処理を加えた
+を呼びだす
-#
-#usage tvrecording.pl ch length(sec) [clip No(000-)] [filename] [bitrate(5)] [TID] [NO] [/dev/video0]
@@ -44 +44 @@
-#$startupsleeptime = 52;                                        #process wait(MAX60sec)
-$startupsleeptime = 37;                                 #process wait(MAX60sec)
-
+
-
-#-------------------------------
@@ -64 +64 @@
-        $recfolderpath = '/home/foltia/php/tv';         
-}#end sub getRecPath
-
+
+
-#準備
-&prepare;
@@ -74 +75 @@
-$reclengthsec = $reclengthsec + $extendrecendsec ;
-
+&callrecordv4l;
+
-&writelog("tvrecording:$recch:$reclengthsec:$outputfile:$recdevice:$capturedeviceinputnum:$ivtvrecch:$stdbitrate:$peakbitrate");
-
-
-
-
+
-sub chkextinput{
-
@@ -87 +88 @@
-                $capturedeviceinputnum = 7 ;
-                }
-0
+1
-        $ivtvrecch = '';
-}elsif($recch == -1){
@@ -95 +96 @@
-                $capturedeviceinputnum = 8;
-                }
-0
+1
-        $ivtvrecch = '';
-}else{
@@ -103 +104 @@
-                $capturedeviceinputnum = 6 ;
-                }
-0
+1
-        $ivtvrecch = $recch;
-}
@@ -304 +305 @@
-                $outputfile = $ARGV[3];
-                $outputfile = &filenameinjectioncheck($outputfile);
+                $outputfilewithoutpath = $outputfile ;
-                $outputfile = $outputpath.$outputfile ;
-#               $outputfile .= "$ARGV[3]";              
-#               $outputfile .= `date  +%Y%m%d-%H%M --date "1 min "`;
-
-
+
-        }else{
-
-
-
-&writelog("tvrecording:  DEBUG ARGV[3] is null  \$outputfile $outputfile ")
-
+       
+       
+       
+               $outputfilewithoutpath = $outputfile 
+
-        }
-
@@ -341 +342 @@
-}#end setbitrate
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/install/perl/updatem2pfiletable.pl

@@ -34 +34 @@
-        $sth->execute();
-
-p
+?
-$file =~ s/$recfolderpath\///;
-$query =  "insert into  foltia_m2pfiles values ('$file')";
@@ -57 +57 @@
-$filetid = $fileline[0];
-$filetid =~ s/[^0-9]//g;
-
-
-
+
+       
+       
-#print "$filetid;$fileline[2];$query\n"
-# http://www.atmarkit.co.jp/fnetwork/rensai/sql03/sql1.html
-
-
+
+# end foreach
-$oserr = $dbh->commit;
-

trunk/install/php/foltia_config2.php.template

@@ -17 +17 @@
-                $recfolderpath = '/home/foltia/php/tv'; //録画ファイルの保存先のパス。
-                $httpmediamappath = '/tv'; //ブラウザから見える録画ファイルのある位置。
-エンコーダの
+アナログキャプチャカードチャンネル
-
-                $protectmode = 0; //未使用:(ブラウザからの予約削除を禁止するなどの保護モードで動作します)
@@ -24 +24 @@
-                $environmentpolicytoken = "";//環境ポリシーのパスワードに連結されるセキュリティコード
-                $perltoolpath = $toolpath ;//perl版の初期設定の位置。デフォルトではphpと同じ位置
+                $usedigital = 1;//Friioなどでデジタル録画をするか 1:する 0:しない
-
-// データベース接続設定

trunk/install/php/index.php

@@ -13 +13 @@
-オプション
-mode:"new"を指定すると、新番組(第1話)のみの表示となる。
+now:YmdHi形式で日付を指定するとその日からの番組表が表示される。
-
- DCC-JPL Japan/foltia project
@@ -32 +33 @@
-}//end if login
-
-
-
+
+
+
+
-function printtitle(){
-
@@ -64 +67 @@
-WHERE foltia_tvrecord.tid = foltia_program.tid 
-AND foltia_program.tid = foltia_subtitle.tid 
-
-
+
+
+
-        ";
-        $reservedrssametid = m_query($con, $query, "DBクエリに失敗しました");
@@ -112 +116 @@
-LEFT OUTER JOIN foltia_station on (foltia_subtitle.stationid = foltia_station.stationid )
-WHERE foltia_tvrecord.stationid = 0 AND
-
+
+
-        ";
-
@@ -145 +150 @@
-WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid 
- AND foltia_subtitle.enddatetime >= '$now'  AND foltia_subtitle.countno = '1' 
-
+
+
-        ";
-        $rs = m_query($con, $query, "DBクエリに失敗しました");
@@ -166 +172 @@
-WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid 
- AND foltia_subtitle.enddatetime >= '$now'  
-
+
+
-        ";
-        $rs = m_query($con, $query, "DBクエリに失敗しました");

trunk/install/php/listreserve.php

@@ -46 +46 @@
-$mymemberid = getmymemberid($con);
-$now = getgetnumform(startdate);
+*if ($now == ""){
+$now = getgetnumform(date);
+}
-
-if ($now > 200501010000){
@@ -63 +66 @@
-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
@@ -79 +83 @@
-foltia_subtitle.startoffset , 
-foltia_subtitle.pid , 
-
+
+
-FROM foltia_tvrecord
-LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -127 +132 @@
-                        <th align="left">話数</th>
-                        <th align="left">サブタイトル</th>
-
+(ズレ)
-                        <th align="left">総尺</th>
-                        <th align="left">画質</th>
+                        <th align="left">デジタル優先</th>
-
-                </tr>
@@ -165 +171 @@
-foltia_tvrecord.bitrate  , 
-foltia_subtitle.startoffset , 
-
+
+
-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
@@ -181 +188 @@
-foltia_tvrecord.bitrate  , 
-foltia_subtitle.startoffset , 
-
+
+
-FROM foltia_tvrecord
-LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -218 +226 @@
-foltia_tvrecord.bitrate  , 
-foltia_subtitle.startoffset , 
-
+
+
-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
@@ -235 +244 @@
-foltia_tvrecord.bitrate  , 
-foltia_subtitle.startoffset , 
-
+
+
-FROM foltia_tvrecord
-LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -277 +287 @@
-                                        }else{
-                                        print "<a href=\"http://cal.syoboi.jp/tid/$tid\" target=\"_blank\">$title</a>";
+
-                                        }
-                                        print "</td>\n";
@@ -305 +316 @@
-                                        //録画レート
-                                        echo("<td>".htmlspecialchars($rowdata[7])."<br></td>\n");
+                                        
+                                        //デジタル優先
+                                        echo("<td>");
+                                        if (htmlspecialchars($rowdata[11]) == 1){
+                                        print "する";
+                                        }else{
+                                        print "しない";
+                                        }
+                                        echo("<br></td>\n");
-                                echo("</tr>\n");
-                        }
@@ -313 +333 @@
-
-<table>
+        <tr><td>アナログ重複表示</td><td><br /></td></tr>
-        <tr><td>エンコーダ数</td><td><?=$recunits ?></td></tr>
-        <tr class="overwraped"><td>チューナー重複</td><td><br /></td></tr>
@@ -329 +350 @@
-foltia_program .title ,
-foltia_tvrecord.bitrate ,
-
+
+
-FROM  foltia_tvrecord , foltia_program , foltia_station 
-  
+
-ORDER BY foltia_program.tid  DESC
-";
@@ -354 +376 @@
-                        <th align="left">録画リスト</th>
-                        <th align="left">画質</th>
+                        <th align="left">デジタル優先</th>
+
-                </tr>
-        </thead>
@@ -385 +409 @@
-                                        //MP4
-                                        echo("<td><a href=\"showlibc.php?tid=$tid\">mp4</a></td>\n");
-
+
-                                        echo("<td>".htmlspecialchars($rowdata[3])."<br></td>\n");
-
+
+
+
+
+
+
+
-                                echo("</tr>\n");
-                                }else{
@@ -395 +425 @@
-                                <td>EPG録画</td>
-                                <td><a href=\"showlibc.php?tid=0\">mp4</a></td>";
-
+
+
+
+
+
+
+
+
+
-                                }//if tid 0
-                        }//for

trunk/install/php/m.php

@@ -35 +35 @@
-
-$now = date("YmdHi");   
+$today = date("Ymd");
+$nowdate = date("Hi",(mktime(date("G"),date("i")+8,date("s"),date("m"),date("d"),date("Y"))));
-$errflag = 0;
-$pname = "手動録画";
@@ -74 +76 @@
-$recstid = getgetnumform(recstid);
-$pname = getgetform(pname);
+//$usedigital = getgetnumform(usedigital);
+
-//確認
-$startdatetime = "$startdate"."$starttime";
@@ -105 +109 @@
-        }
-}
+//デジタル優先
+/*if ($usedigital == 1){
+}else{
+        $usedigital = 0;
+}
+*/
-//正しければ
-if ($errflag == 0){
@@ -193 +203 @@
-  <p>放送日:
-    <input name="startdate" type="text" id="startdate" size="9" value="<?=$startdate?>" />
-19800121
+<?=$today?>
-  <p>録画開始時刻:
-    <input name="starttime" type="text" id="starttime" size="5" value="<?=$starttime?>" />
-2304
+<?=$nowdate?>
-  <p>
-    録画尺:
@@ -205 +215 @@
-<?php
-$query = "
-
+,digitalch 
-FROM foltia_station 
-WHERE stationrecch > 0 
+UNION 
+SELECT DISTINCT  stationid,stationname,stationrecch ,digitalch 
+FROM  foltia_station 
+WHERE digitalch > 0
-ORDER BY \"stationid\" ASC";
-
@@ -248 +262 @@
-        }
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-?>
-  <p>番組名:

trunk/install/php/reservecomp.php

@@ -54 +54 @@
-                $station = 0;
-                }
-
+
+
+
+
-$bitrate = getgetnumform(bitrate);
-                if ($bitrate == "") {
@@ -202 +205 @@
-
-                if ($maxrows == 0) { //新規追加
-
+,'$usedigital'
-                                $rs = m_query($con, $query, "DB書き込みに失敗しました");
-                }else{//修正　(ビットレート)
-                        $query = "UPDATE  foltia_tvrecord  SET 
-
-
+
-                        $rs = m_query($con, $query, "DB書き込みに失敗しました");
-                }

trunk/install/php/reserveepgcomp.php

@@ -78 +78 @@
-        }else{
-        $rowdata = pg_fetch_row($rs, 0);
+        
-        $insertpid = $rowdata[0];
-
+
+
+
+
+
-        }
-// next 話数を探す
@@ -121 +126 @@
-values ( '$insertpid','0','$stationid',
-        '$nextcno','$subtitle','$startdatetime','$enddatetime','0' ,'$lengthmin' , '$memberid')";
-
-        $rs = m_query($con, $query, "DBクエリに失敗しました");
-
@@ -143 +147 @@
-}
-
-?>
-
-
-<?php
-print "<table width=\"100%\" border=\"0\">
-    <tr><td>放送開始</td><td>$startdatetime</td></tr>

trunk/install/php/reserveprogram.php

@@ -89 +89 @@
-  <tr>
-    <td>放送局</td>
-
+
+
-  </tr>
-  <tr>
@@ -128 +129 @@
-
-        </td>
+        
+        <td>
+        <select name="usedigital">
+        <?php
+         if ($usedigital == 1){
+                print "
+                <option value=\"1\" selected>する</option>
+                <option value=\"0\">しない</option>
+                ";
+                }else{
+                print "
+                <option value=\"1\">する</option>
+                <option value=\"0\" selected>しない</option>
+                ";
+                }
+        ?>
+        </select>
+        </td>
+
-    <td><select name="bitrate">
-        <option value="14">最高画質</option>

trunk/install/php/selectcaptureimage.php

@@ -116 +116 @@
-        $tid = ereg_replace("[^0-9]", "", $tid);
-
-
+|\.m2t$
-$serveruri = getserverfqdn ();
-
@@ -124 +124 @@
-
-if (file_exists("./sb-edit.php") ) {
-width='160' height='120' 
+
-}else{
-width='160' height='120'
+
-}
-}//foreach

trunk/install/php/showlib.php

@@ -36 +36 @@
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<title>foltia:MP4 Lib</title>
-</head>
-
-<?php
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?>
-<body BGCOLOR="#ffffff" TEXT="#494949" LINK="#0047ff" VLINK="#000000" ALINK="#c6edff" >
-<div align="center">
-<?php 
-        printhtmlpageheader();
-?>
-  <p align="left"><font color="#494949" size="6">録画ライブラリ表示</font></p>
-  <hr size="4">
-<p align="left">再生可能ライブラリを表示します。<br>
-
-<?
-//新仕様 /* 2006/10/26 */
-$query = "
@@ -70 +89 @@
-
-if ($maxrows > 0 ){
+if(ereg("iPhone",$useragent)){
+        print "<ul id=\"home\" title=\"録画ライブラリ表示\" selected=\"true\">";
+}else{
-print "
-  <table BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">
@@ -82 +104 @@
-        <tbody>
-";
+}
-for ($row = 0; $row < $maxrows; $row++) {
-        $rowdata = pg_fetch_row($rs, $row);
@@ -90 +113 @@
-$counts = htmlspecialchars($counts);
-
+if(ereg("iPhone",$useragent)){
+print "<li><a href=\"showlibc.php?tid=$tid\" target=\"_self\">$title</a></li>\n";
+}else{
-print "
-<tr>
@@ -98 +124 @@
-</tr>\n
-";
+}
-}//for
+
+if(ereg("iPhone",$useragent)){
+        print "</ul>\n</body>\n</html>\n";
+}else{
-print "
-        </tbody>
@@ -105 +136 @@
-</html>
-";
+}
+
-}else{
-print "録画ファイルが存在しません。</body></html>";

trunk/install/php/showlibc.php

@@ -41 +41 @@
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="stylesheet" type="text/css" href="graytable.css">
-<script src="http://images.apple.com/main/js/ac_quicktime.js" language="JavaScript" type="text/javascript"></script> 
-<?php
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        print "<title>foltia:Lib</title>
-</head><body BGCOLOR=\"#ffffff\" TEXT=\"#494949\" LINK=\"#0047ff\" VLINK=\"#000000\" ALINK=\"#c6edff\" > \n";
-                printhtmlpageheader();
-                die_exit("再生可能番組がありません<BR>");
-       
+
-$now = date("YmdHi");   
-
@@ -75 +85 @@
-}
-//ヘッダ続き
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-<div align=\"center\">
-";
@@ -84 +104 @@
-  <hr size=\"4\">
-<p align=\"left\">再生可能ムービーを表示します。<br>";
-
-$serveruri = getserveruri();
-if ($tid == 0){
-print "$title 【<A HREF = \"./folcast.php?tid=$tid\">この番組のFolcast</A> [<a href=\"itpc://$serveruri/folcast.php?tid=$tid\">iTunesに登録</a>】 <br>\n";
@@ -93 +111 @@
-                                     htmlspecialchars($tid)  . "\" target=\"_blank\">$title</a> 【<A HREF = \"./folcast.php?tid=$tid\">この番組のFolcast</A> [<a href=\"itpc://$serveruri/folcast.php?tid=$tid\">iTunesに登録</a>]】 <br>\n";
-}
+}// endif if(ereg("iPhone",$useragent))
+
-//確認
-if (file_exists ("$recfolderpath/$tid.localized")){
@@ -101 +121 @@
-        exit;
-}                                        
-
-
-
-//新仕様/* 2006/10/26 */
@@ -133 +151 @@
-$maxrows = pg_num_rows($rs);
-if ($maxrows > 0 ){
+if(ereg("iPhone",$useragent)){
+        print "<ul id=\"home\" title=\"$title\" selected=\"true\">";
+}else{
-print "
-  <table BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">
-        <tbody>
-";
-
+
-for ($row = 0; $row < $maxrows; $row++) {
-        $rowdata = pg_fetch_row($rs, $row);
@@ -178 +199 @@
-
-if (($sbpluginexist == 1) && (pg_num_rows ($rs ) > 0)){
-
+
+
-        
-        if (($capimgpath != "") && (file_exists("$recfolderpath/$tid.localized/img/$capimgpath") )){
@@ -195 +217 @@
-}
-
-
+
+
+
+
+
-print "  <tr>
-    <td rowspan=\"4\" width=\"170\"><a href = \"$httpmediamappath/$tid.localized/mp4/$fName\" target=\"_blank\"><img src = \"$imgsrcuri\" width=\"160\" height=\"120\"></a></td>
@@ -202 +228 @@
-  <tr>
-";
-
-
-
-
-
+       
+       
+       
+       
+       
-print "  </tr>
-  <tr>
@@ -216 +242 @@
-";
-
+}//endif iPhone
+
-}//for
-}else{
-print "録画ファイルがありません<br>\n";
-}//if
+
+if(ereg("iPhone",$useragent)){
+        print "<li><a href=\"http://$serveruri/showlib.php\" target=\"_self\">一覧へ戻る</a></li>\n";
+        print "</ul>\n";
+}else{
+        print "</tbody></table>\n";
+}
-?>
-        </tbody>
-</table>
-
-</body>
-</html>
+
+        

trunk/install/php/showplaylist.php

@@ -14 +14 @@
-　省略時、録画順にソートされる。
-　titleのときに、番組順ソートされる。
-
+/m2t
-
- DCC-JPL Japan/foltia project
@@ -97 +97 @@
-//旧仕様
-if($list == "raw"){
-p
+?
-
-
@@ -106 +106 @@
-
-        if(($fName == ".") or ($fName == "..") ){ continue; }
-p
+.+
-                $filesplit = split("-",$fName);
-        
@@ -230 +230 @@
-}
-        if (file_exists("./selectcaptureimage.php") ) {
-p
+.+
-        print "                 <td align=\"left\"><a href=\"./selectcaptureimage.php?pid=$pid\">キャプ</a></td>\n";
-        }