# HG changeset patch # User epgrec@park.mda.or.jp # Date 1268466329 -32400 # Node ID 3bed74eca373826bd08cce7f33df0d30341028b0 # Parent 4bd07b03c69428523d547943d49974e00b94d288 change: EPG取得並列化が可能かどうかを判定するように変更 diff -r 4bd07b03c694 -r 3bed74eca373 getepg.old.php --- a/getepg.old.php Mon Mar 08 19:17:56 2010 +0900 +++ b/getepg.old.php Sat Mar 13 16:45:29 2010 +0900 @@ -1,6 +1,8 @@ #!/usr/bin/php temp_xml."_bs"; @@ -43,8 +50,14 @@ exec( $cmdline ); $cmdline = $settings->epgdump." /BS ".$settings->temp_data." ".$temp_xml_bs; exec( $cmdline ); - $cmdline = INSTALL_PATH."/storeProgram.php BS ".$temp_xml_bs." >/dev/null 2>&1 &"; - exec( $cmdline ); + if( $use_para ) { + $cmdline = INSTALL_PATH."/storeProgram.php BS ".$temp_xml_bs." >/dev/null 2>&1 &"; + exec( $cmdline ); + } + else { + storeProgram( "BS", $temp_xml_bs ); + if( file_exists( $temp_xml_bs ) ) @unlink( $temp_xml_bs ); + } if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); } @@ -56,8 +69,14 @@ exec( $cmdline ); $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$temp_xml_cs1; exec( $cmdline ); - $cmdline = INSTALL_PATH."/storeProgram.php CS ".$temp_xml_cs1." >/dev/null 2>&1 &"; - exec( $cmdline ); + if( $use_para ) { + $cmdline = INSTALL_PATH."/storeProgram.php CS ".$temp_xml_cs1." >/dev/null 2>&1 &"; + exec( $cmdline ); + } + else { + storeProgram( "CS", $temp_xml_cs1 ); + if( file_exists( $temp_xml_cs1 ) ) @unlink( $temp_xml_cs1 ); + } if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); } $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); @@ -66,8 +85,14 @@ exec( $cmdline ); $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$temp_xml_cs2; exec( $cmdline ); - $cmdline = INSTALL_PATH."/storeProgram.php CS ".$temp_xml_cs2." >/dev/null 2>&1 &"; - exec( $cmdline ); + if( $use_para ) { + $cmdline = INSTALL_PATH."/storeProgram.php CS ".$temp_xml_cs2." >/dev/null 2>&1 &"; + exec( $cmdline ); + } + else { + storeProgram( "CS", $temp_xml_cs2 ); + if( file_exists( $temp_xml_cs2 ) ) @unlink( $temp_xml_cs2 ); + } if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); } } @@ -83,11 +108,22 @@ exec( $cmdline ); $cmdline = $settings->epgdump." ".$key." ".$settings->temp_data." ".$temp_xml_gr.$value.""; exec( $cmdline ); - $cmdline = INSTALL_PATH."/storeProgram.php GR ".$temp_xml_gr.$value." >/dev/null 2>&1 &"; - exec( $cmdline ); + if( $use_para ) { + $cmdline = INSTALL_PATH."/storeProgram.php GR ".$temp_xml_gr.$value." >/dev/null 2>&1 &"; + exec( $cmdline ); + } + else { + storeProgram( "GR", $temp_xml_gr.$value ); + if( file_exists( $temp_xml_gr.$value ) ) @unlink( $temp_xml_gr.$value ); + } if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); } } } + // 筝х + if( $use_para ) exit(); + garbageClean(); // 筝荀違 + doKeywordReservation(); // 若若篋膣 + exit(); ?> \ No newline at end of file diff -r 4bd07b03c694 -r 3bed74eca373 mediatomb.php --- a/mediatomb.php Mon Mar 08 19:17:56 2010 +0900 +++ b/mediatomb.php Sat Mar 13 16:45:29 2010 +0900 @@ -1,7 +1,8 @@ #!/usr/bin/php delete(); + + // 8ヤ札筝若帥井 + $arr = array(); + $arr = DBRecord::createRecords( PROGRAM_TBL, "WHERE starttime > adddate( now(), 8 )" ); + foreach( $arr as $val ) $val->delete(); +} + +function doKeywordReservation() { + // 若若牙私膣 + $arr = array(); + $arr = Keyword::createKeywords(); + foreach( $arr as $val ) { + try { + $val->reservation(); + } + catch( Exception $e ) { + // ∴ + } + } +} + +function storeProgram( $type, $xmlfile ) { + global $BS_CHANNEL_MAP, $GR_CHANNEL_MAP, $CS_CHANNEL_MAP; + // ｃ潟＜ゃ羣 + $map = array(); + if( $type == "BS" ) $map = $BS_CHANNEL_MAP; + else if( $type == "GR") $map = $GR_CHANNEL_MAP; + else if( $type == "CS") $map = $CS_CHANNEL_MAP; + + // XML parse + $xml = @simplexml_load_file( $xmlfile ); + if( $xml === false ) { + return; // XML茯水篏 + } + // channel遵 + foreach( $xml->channel as $ch ) { + $disc = $ch['id']; + try { + // ｃ潟若帥｢ + $num = DBRecord::countRecords( CHANNEL_TBL , "WHERE channel_disc = '" . $disc ."'" ); + if( $num == 0 ) { + if( array_key_exists( "$disc", $map ) ) { + // ｃ潟若帥域鋎 + $rec = new DBRecord( CHANNEL_TBL ); + $rec->type = $type; + $rec->channel = $map["$disc"]; + $rec->channel_disc = $disc; + $rec->name = $ch->{'display-name'}; + } + } + else { + // 絖翫ｃ潟贋違 + $rec = new DBRecord(CHANNEL_TBL, "channel_disc", $disc ); + $rec->name = $ch->{'display-name'}; + } + } + catch( Exception $e ) { + // ∴ + } + } + // channel 腟篋 + + // programme 緇 + + foreach( $xml->programme as $program ) { + $channel_disc = $program['channel']; + if( ! array_key_exists( "$channel_disc", $map ) ) continue; + + $channel = $map["$channel_disc"]; + $starttime = str_replace(" +0900", '', $program['start'] ); + $endtime = str_replace( " +0900", '', $program['stop'] ); + $title = $program->title; + $desc = $program->desc; + $cat_ja = ""; + $cat_en = ""; + foreach( $program->category as $cat ) { + if( $cat['lang'] == "ja_JP" ) $cat_ja = $cat; + if( $cat['lang'] == "en" ) $cat_en = $cat; + } + $program_disc = md5( $channel_disc . $starttime . $endtime ); + // printf( "%s %s %s %s %s %s %s \n", $program_disc, $channel, $starttime, $endtime, $title, $desc, $cat_ja ); + try { + // 眼 + $category_disc = md5( $cat_ja . $cat_en ); + $num = DBRecord::countRecords(CATEGORY_TBL, "WHERE category_disc = '".$category_disc."'" ); + $cat_rec = null; + if( $num == 0 ) { + // 域眼菴遵 + $cat_rec = new DBRecord( CATEGORY_TBL ); + $cat_rec->name_jp = $cat_ja; + $cat_rec->name_en = $cat_en; + $cat_rec->category_disc = $category_disc; + } + else + $cat_rec = new DBRecord(CATEGORY_TBL, "category_disc" , $category_disc ); + // + $channel_rec = new DBRecord(CHANNEL_TBL, "channel_disc", $channel_disc ); + $num = DBRecord::countRecords(PROGRAM_TBL, "WHERE program_disc = '".$program_disc."'" ); + if( $num == 0 ) { + // 域腟 + // 茲с 絽腟 + $options = "WHERE channel_disc = '".$channel_disc."' ". + "AND starttime < '". $endtime ."' AND endtime > '".$starttime."'"; + $battings = DBRecord::countRecords(PROGRAM_TBL, $options ); + if( $battings > 0 ) { + // 茲榊鐚丈紊 + $records = DBRecord::createRecords(PROGRAM_TBL, $options ); + foreach( $records as $rec ) { + // 牙私膣腟丈紊眼ｃゃ + try { + $reserve = new DBRecord(RESERVE_TBL, "program_id", $rec->id ); + if( $reserve->autorec ) { + Reservation::cancel( $reserve->id ); + } + } + catch( Exception $e ) { + //∴ + } + // 腟 + $rec->delete(); + } + } + // // + $rec = new DBRecord( PROGRAM_TBL ); + $rec->channel_disc = $channel_disc; + $rec->channel_id = $channel_rec->id; + $rec->type = $type; + $rec->channel = $channel_rec->channel; + $rec->title = $title; + $rec->description = $desc; + $rec->category_id = $cat_rec->id; + $rec->starttime = $starttime; + $rec->endtime = $endtime; + $rec->program_disc = $program_disc; + } + else { + // 腟絎号贋 + $rec = new DBRecord( PROGRAM_TBL, "program_disc", $program_disc ); + $rec->title = $title; + $rec->description = $desc; + $rec->category_id = $cat_rec->id; + } + } + catch(Exception $e) { + exit( $e->getMessage() ); + } + } + // Programme緇絎篋 +} +?> \ No newline at end of file diff -r 4bd07b03c694 -r 3bed74eca373 storeProgram.php --- a/storeProgram.php Mon Mar 08 19:17:56 2010 +0900 +++ b/storeProgram.php Sat Mar 13 16:45:29 2010 +0900 @@ -1,10 +1,12 @@ #!/usr/bin/php delete(); - - // 8ヤ札筝若帥井 - $arr = array(); - $arr = DBRecord::createRecords( PROGRAM_TBL, "WHERE starttime > adddate( now(), 8 )" ); - foreach( $arr as $val ) $val->delete(); - - // 若若牙私膣 - $arr = array(); - $arr = Keyword::createKeywords(); - foreach( $arr as $val ) { - try { - $val->reservation(); - } - catch( Exception $e ) { - // ∴ - } - } - exit(); - - function storeProgram( $type, $xmlfile ) { - global $BS_CHANNEL_MAP, $GR_CHANNEL_MAP, $CS_CHANNEL_MAP; - // ｃ潟＜ゃ羣 - $map = array(); - if( $type == "BS" ) $map = $BS_CHANNEL_MAP; - else if( $type == "GR") $map = $GR_CHANNEL_MAP; - else if( $type == "CS") $map = $CS_CHANNEL_MAP; - - // XML parse - $xml = @simplexml_load_file( $xmlfile ); - if( $xml === false ) { - return; // XML茯水篏 - } - // channel遵 - foreach( $xml->channel as $ch ) { - $disc = $ch['id']; - try { - // ｃ潟若帥｢ - $num = DBRecord::countRecords( CHANNEL_TBL , "WHERE channel_disc = '" . $disc ."'" ); - if( $num == 0 ) { - if( array_key_exists( "$disc", $map ) ) { - // ｃ潟若帥域鋎 - $rec = new DBRecord( CHANNEL_TBL ); - $rec->type = $type; - $rec->channel = $map["$disc"]; - $rec->channel_disc = $disc; - $rec->name = $ch->{'display-name'}; - } - } - else { - // 絖翫ｃ潟贋違 - $rec = new DBRecord(CHANNEL_TBL, "channel_disc", $disc ); - $rec->name = $ch->{'display-name'}; - } - } - catch( Exception $e ) { - // ∴ - } - } - // channel 腟篋 - - // programme 緇 - - foreach( $xml->programme as $program ) { - $channel_disc = $program['channel']; - if( ! array_key_exists( "$channel_disc", $map ) ) continue; - - $channel = $map["$channel_disc"]; - $starttime = str_replace(" +0900", '', $program['start'] ); - $endtime = str_replace( " +0900", '', $program['stop'] ); - $title = $program->title; - $desc = $program->desc; - $cat_ja = ""; - $cat_en = ""; - foreach( $program->category as $cat ) { - if( $cat['lang'] == "ja_JP" ) $cat_ja = $cat; - if( $cat['lang'] == "en" ) $cat_en = $cat; - } - $program_disc = md5( $channel_disc . $starttime . $endtime ); - // printf( "%s %s %s %s %s %s %s \n", $program_disc, $channel, $starttime, $endtime, $title, $desc, $cat_ja ); - try { - // 眼 - $category_disc = md5( $cat_ja . $cat_en ); - $num = DBRecord::countRecords(CATEGORY_TBL, "WHERE category_disc = '".$category_disc."'" ); - $cat_rec = null; - if( $num == 0 ) { - // 域眼菴遵 - $cat_rec = new DBRecord( CATEGORY_TBL ); - $cat_rec->name_jp = $cat_ja; - $cat_rec->name_en = $cat_en; - $cat_rec->category_disc = $category_disc; - } - else - $cat_rec = new DBRecord(CATEGORY_TBL, "category_disc" , $category_disc ); - // - $channel_rec = new DBRecord(CHANNEL_TBL, "channel_disc", $channel_disc ); - $num = DBRecord::countRecords(PROGRAM_TBL, "WHERE program_disc = '".$program_disc."'" ); - if( $num == 0 ) { - // 域腟 - // 茲с 絽腟 - $options = "WHERE channel_disc = '".$channel_disc."' ". - "AND starttime < '". $endtime ."' AND endtime > '".$starttime."'"; - $battings = DBRecord::countRecords(PROGRAM_TBL, $options ); - if( $battings > 0 ) { - // 茲榊鐚丈紊 - $records = DBRecord::createRecords(PROGRAM_TBL, $options ); - foreach( $records as $rec ) { - // 牙私膣腟丈紊眼ｃゃ - try { - $reserve = new DBRecord(RESERVE_TBL, "program_id", $rec->id ); - if( $reserve->autorec ) { - Reservation::cancel( $reserve->id ); - } - } - catch( Exception $e ) { - //∴ - } - // 腟 - $rec->delete(); - } - } - // // - $rec = new DBRecord( PROGRAM_TBL ); - $rec->channel_disc = $channel_disc; - $rec->channel_id = $channel_rec->id; - $rec->type = $type; - $rec->channel = $channel_rec->channel; - $rec->title = $title; - $rec->description = $desc; - $rec->category_id = $cat_rec->id; - $rec->starttime = $starttime; - $rec->endtime = $endtime; - $rec->program_disc = $program_disc; - } - else { - // 腟絎号贋 - $rec = new DBRecord( PROGRAM_TBL, "program_disc", $program_disc ); - $rec->title = $title; - $rec->description = $desc; - $rec->category_id = $cat_rec->id; - } - } - catch(Exception $e) { - exit( $e->getMessage() ); - } - } - } + garbageClean(); // 筝荀違 + doKeywordReservation(); // 若若篋膣 ?> \ No newline at end of file diff -r 4bd07b03c694 -r 3bed74eca373 upgrade_db.php --- a/upgrade_db.php Mon Mar 08 19:17:56 2010 +0900 +++ b/upgrade_db.php Sat Mar 13 16:45:29 2010 +0900 @@ -1,6 +1,8 @@ #!/usr/bin/php \ No newline at end of file +?>