Mercurial > epgrec.yaz
comparison getepg.php @ 82:330c83ae8c95
fix: CSのEPG取得時に予約重複チェックを行っていなかったのを修正
author | yoneda <yoneda@recorder.localnet.mda.or.jp> |
---|---|
date | Sun, 28 Feb 2010 21:44:16 +0900 |
parents | 1363ac056197 |
children | 3ec5ca5e56ca |
comparison
equal
deleted
inserted
replaced
81:322bba0d33e5 | 82:330c83ae8c95 |
---|---|
21 $cmdline = $settings->epgdump." /BS ".$settings->temp_data." ".$settings->temp_xml; | 21 $cmdline = $settings->epgdump." /BS ".$settings->temp_data." ".$settings->temp_xml; |
22 exec( $cmdline ); | 22 exec( $cmdline ); |
23 storeProgram( "BS", $settings->temp_xml ); | 23 storeProgram( "BS", $settings->temp_xml ); |
24 if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); | 24 if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); |
25 if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); | 25 if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); |
26 } | |
26 | 27 |
27 // CS | 28 // CS |
28 if ($settings->cs_rec_flg != 0) { | 29 if ($settings->cs_rec_flg != 0) { |
30 $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); | |
31 if( $num == 0 ) { | |
29 $cmdline = "CHANNEL=CS8 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; | 32 $cmdline = "CHANNEL=CS8 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; |
30 exec( $cmdline ); | 33 exec( $cmdline ); |
31 $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; | 34 $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; |
32 exec( $cmdline ); | 35 exec( $cmdline ); |
33 storeProgram( "CS", $settings->temp_xml ); | 36 storeProgram( "CS", $settings->temp_xml ); |
34 if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); | 37 if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); |
35 if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); | 38 if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); |
36 | 39 } |
40 $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); | |
41 if( $num == 0 ) { | |
37 $cmdline = "CHANNEL=CS24 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; | 42 $cmdline = "CHANNEL=CS24 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; |
38 exec( $cmdline ); | 43 exec( $cmdline ); |
39 $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; | 44 $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; |
40 exec( $cmdline ); | 45 exec( $cmdline ); |
41 storeProgram( "CS", $settings->temp_xml ); | 46 storeProgram( "CS", $settings->temp_xml ); |