Index: trunk/install/perl/digitaltvrecording.pl =================================================================== --- trunk/install/perl/digitaltvrecording.pl (リビジョン 83) +++ trunk/install/perl/digitaltvrecording.pl (リビジョン 91) @@ -327,9 +327,10 @@ sub calldigitalrecorder{ # -#いまんところ白friioと黒friioのみ +#白friioと黒friio、PT1対応 #2008/10/23 recfriio4仕様に変更 # my $oserr = 0; - +my $originalrecch = $recch; +my $errorflag = 0; if ($bandtype == 0){ # 地デジ friio @@ -375,5 +376,20 @@ } - +# PT1 +# b25,recpt1があるか確認 + if (-e "$toolpath/perl/tool/recpt1"){ + &writelog("digitaltvrecording DEBUG recpt1 --b25 $originalrecch $reclengthsec $outputfile "); + $oserr = system("$toolpath/perl/tool/recpt1 --b25 $originalrecch $reclengthsec $outputfile "); + $oserr = $oserr >> 8; + if ($oserr > 0){ + &writelog("digitaltvrecording :ERROR :PT1 is BUSY.$oserr"); + $errorflag = 2; + } + }else{ # エラー recpt1がありません + &writelog("digitaltvrecording :ERROR :recpt1 not found. You must install $toolpath/b25 and $toolpath/recpt1."); + $errorflag = 1; + } +# friio +if ($errorflag >= 1 ){ # b25,recfriioがあるか確認 if (-e "$toolpath/perl/tool/recfriio"){ @@ -396,4 +412,5 @@ exit 1; } +}#end if errorflag #BS1/BS2などのスプリットを Index: trunk/install/perl/recwrap.pl =================================================================== --- trunk/install/perl/recwrap.pl (リビジョン 83) +++ trunk/install/perl/recwrap.pl (リビジョン 91) @@ -464,9 +464,6 @@ @processline = split(/\s+/,$_); $filename = $processline[8]; - #print "DEBUG $_ \n"; - #print "DEBUG $processline[0]/$processline[1]/$processline[2]/$processline[3]/$processline[4]/$processline[5]/$processline[6]/$processline[7]/$processline[8] \n"; $filename =~ s/$recfolderpath\///; - #print "DEBUG FILENAME $filename\n"; - &writelog("recwrap DEBUG continuousrecordingcheck() FILENAME $filename"); + &writelog("recwrap DEBUG continuousrecordingcheck() FILENAME $filename"); # 1520-9-20081201-0230.m2t @filenameparts = split(/-/,$filename); @@ -474,5 +471,6 @@ $startdate = $filenameparts[2]; $starttime = $filenameparts[3]; - $startdatetime = $filenameparts[2].$filenameparts[3]; + @filenameparts = split(/\./,$starttime); + $startdatetime = $startdate.$filenameparts[0]; #DBから録画中番組のデータ探す $DBQuery = " Index: trunk/install/php/viewepg.php =================================================================== --- trunk/install/php/viewepg.php (リビジョン 70) +++ trunk/install/php/viewepg.php (リビジョン 91) @@ -40,5 +40,5 @@ "; @@ -261,15 +262,21 @@ } - }elseif ($item[$i][$stationname] == ""){ +// }elseif ((!isset($item[$i][$stationname]))&&($item[$i][$stationname] == "")){ + }elseif (!isset($item[$i][$stationname])){ //ヌルなら - $item[$i][$stationname] = $item[$i][$stationname] ; + //$item[$i][$stationname] = $item[$i][$stationname] ; + $item[$i][$stationname] = null ; // $item[$i][$stationname] = "
" ; }else{ //なんか入ってるなら $rowspan = $i - $dataplace; + $itemDataplaceStationname = null; + if (isset($item[$dataplace][$stationname])){ + $itemDataplaceStationname = $item[$dataplace][$stationname]; + } if ($rowspan === 1 ){ - $item[$dataplace][$stationname] = ""; + $item[$dataplace][$stationname] = ""; }else{ - $item[$dataplace][$stationname] = ""; + $item[$dataplace][$stationname] = ""; // $item[$dataplace][$stationname] = ""; }