diff --git a/bin/fetcher.php b/bin/fetcher.php index a29b187c5..676e310cc 100755 --- a/bin/fetcher.php +++ b/bin/fetcher.php @@ -999,6 +999,7 @@ class Fetcher implements CrawlConstants $session = md5($time . AUTH_KEY); $post_data['time'] = $time; $post_data['session'] = $session; + $post_data['fetcher_peak_memory'] = memory_get_peak_usage(); $info_string = FetchUrl::getPage($queue_server, $post_data); crawlLog( diff --git a/bin/queue_server.php b/bin/queue_server.php index f0e606f09..f4ca997c8 100755 --- a/bin/queue_server.php +++ b/bin/queue_server.php @@ -339,11 +339,24 @@ class QueueServer implements CrawlConstants */ function startCrawl($info) { + //to get here we at least have to have a crawl_time $this->crawl_time = $info[self::CRAWL_TIME]; - $this->crawl_order = $info[self::CRAWL_ORDER]; - $this->restrict_sites_by_url = $info[self::RESTRICT_SITES_BY_URL]; - $this->allowed_sites = $info[self::ALLOWED_SITES]; - $this->disallowed_sites = $info[self::DISALLOWED_SITES]; + + $read_from_info = array( + "crawl_order" => self::CRAWL_ORDER, + "restrict_sites_by_url" => self::RESTRICT_SITES_BY_URL, + "allowed_sites" => self::ALLOWED_SITES, + "disallowed_sites" => self::DISALLOWED_SITES, + ); + $try_to_set_from_old_index = array(); + foreach($read_from_info as $index_field => $info_field) { + if(isset($info[$info_field])) { + $this->$index_field = $info[$info_field]; + } else { + array_push($try_to_set_from_old_index, $index_field); + } + } + switch($this->crawl_order) { case self::BREADTH_FIRST: @@ -370,12 +383,21 @@ class QueueServer implements CrawlConstants CRAWL_DIR.'/cache/'. self::index_data_base_name.$this->crawl_time, URL_FILTER_SIZE, NUM_ARCHIVE_PARTITIONS, - NUM_INDEX_PARTITIONS, $info['DESCRIPTION']); + NUM_INDEX_PARTITIONS, serialize($info)); } else { - $this->index_archive = new IndexArchiveBundle( - CRAWL_DIR.'/cache/'. - self::index_data_base_name.$this->crawl_time, + $dir = CRAWL_DIR.'/cache/'. + self::index_data_base_name.$this->crawl_time; + $this->index_archive = new IndexArchiveBundle($dir, URL_FILTER_SIZE); + $archive_info = IndexArchiveBundle::getArchiveInfo($dir); + $index_info = unserialize($archive_info['DESCRIPTION']); + + foreach($try_to_set_from_old_index as $index_field) { + if(isset($index_info[$read_from_info[$index_field]]) ) { + $this->$index_field = + $index_info[$read_from_info[$index_field]]; + } + } } // chmod so web server can also write to these directories @@ -836,9 +858,11 @@ class QueueServer implements CrawlConstants $crawl_status['CRAWL_TIME'] = $this->crawl_time; $info_bundle = IndexArchiveBundle::getArchiveInfo( CRAWL_DIR.'/cache/'.self::index_data_base_name.$this->crawl_time); + $index_archive_info = unserialize($info_bundle['DESCRIPTION']); $crawl_status['COUNT'] = $info_bundle['COUNT']; - $crawl_status['VISITED_URLS_COUNT'] = $info_bundle['VISITED_URLS_COUNT']; - $crawl_status['DESCRIPTION'] = $info_bundle['DESCRIPTION']; + $crawl_status['VISITED_URLS_COUNT'] =$info_bundle['VISITED_URLS_COUNT']; + $crawl_status['DESCRIPTION'] = $index_archive_info['DESCRIPTION']; + $crawl_status['QUEUE_PEAK_MEMORY'] = memory_get_peak_usage(); file_put_contents( CRAWL_DIR."/schedules/crawl_status.txt", serialize($crawl_status)); chmod(CRAWL_DIR."/schedules/crawl_status.txt", 0777); @@ -846,7 +870,8 @@ class QueueServer implements CrawlConstants "End checking for new URLs data memory usage".memory_get_usage()); crawlLog( - "The current crawl description is: ".$info_bundle['DESCRIPTION']); + "The current crawl description is: ". + $index_archive_info['DESCRIPTION']); crawlLog("Number of unique pages so far: ". $info_bundle['VISITED_URLS_COUNT']); crawlLog("Total urls extracted so far: ".$info_bundle['COUNT']); diff --git a/configs/config.php b/configs/config.php index 2ba10d5e7..ac1b4768a 100755 --- a/configs/config.php +++ b/configs/config.php @@ -180,7 +180,15 @@ define('COMMON_WORD_THRESHOLD', 1000); define('MAX_LINKS_PER_PAGE', 50); /** maximum number of words from links to consider on any given page */ -define('MAX_LINKS_WORD_TEXT', 100); +define('MAX_LINKS_WORD_TEXT', 100); + +/** maximum length of urls to try to queue, this is important for + * memory when creating schedule, since the amount of memory is + * going to be greater than the product MAX_URL_LENGTH*MAX_FETCH_SIZE + * text_processors need to promise to implement this check or rely + * on the base class which does implement it in extractHttpHttpsUrls + */ +define('MAX_URL_LENGTH', 512); /** request this many bytes out of a page */ define('PAGE_RANGE_REQUEST', 50000); diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index f556e9c3f..53552a67a 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -684,7 +684,8 @@ class AdminController extends Controller implements CrawlConstants $info[self::STATUS] = "NEW_CRAWL"; $info[self::CRAWL_TIME] = time(); $seed_info = $this->crawlModel->getSeedInfo(); - + $info[self::TO_CRAWL] = + $seed_info['seed_sites']['url']; $info[self::CRAWL_ORDER] = $seed_info['general']['crawl_order']; $info[self::RESTRICT_SITES_BY_URL] = @@ -742,14 +743,10 @@ class AdminController extends Controller implements CrawlConstants $info[self::STATUS] = "RESUME_CRAWL"; $info[self::CRAWL_TIME] = $this->clean($_REQUEST['timestamp'], "int"); - $info[self::CRAWL_ORDER] = - $seed_info['general']['crawl_order']; - $info[self::RESTRICT_SITES_BY_URL] = - $seed_info['general']['restrict_sites_by_url']; - $info[self::ALLOWED_SITES] = - $seed_info['allowed_sites']['url']; - $info[self::DISALLOWED_SITES] = - $seed_info['disallowed_sites']['url']; + /* + we only set crawl time. Other data such as allowed sites + should come from index. + */ $info_string = serialize($info); file_put_contents( CRAWL_DIR."/schedules/queue_server_messages.txt", @@ -797,24 +794,50 @@ class AdminController extends Controller implements CrawlConstants $data["leftorright"] = (getLocaleDirection() == 'ltr') ? "right": "left"; $data["ELEMENT"] = "crawloptionsElement"; - $seed_info = $this->crawlModel->getSeedInfo(); + $crawls = $this->crawlModel->getCrawlList(); + $update_flag = false; + $data['available_options'] = array( + tl('admin_controller_use_below'), + tl('admin_controller_use_defaults')); + $data['options_default'] = tl('admin_controller_use_below'); + foreach($crawls as $crawl) { + $data['available_options'][$crawl['CRAWL_TIME']] = + tl('admin_controller_previous_crawl')." ". + $crawl['DESCRIPTION']; + } + $no_further_changes = false; + if(isset($_REQUEST['load_option']) && + $_REQUEST['load_option'] == 1) { + $seed_info = $this->crawlModel->getSeedInfo(true); + $update_flag = true; + $no_further_changes = true; + } else if (isset($_REQUEST['load_option']) && + $_REQUEST['load_option'] > 1 ) { + $timestamp = + $this->clean($_REQUEST['load_option'], "int"); + $seed_info = $this->crawlModel->getCrawlSeedInfo( + $timestamp); + $update_flag = true; + $no_further_changes = true; + } else { + $seed_info = $this->crawlModel->getSeedInfo(); + } $data['available_crawl_orders'] = array( self::BREADTH_FIRST => tl('admin_controller_breadth_first'), self::PAGE_IMPORTANCE => tl('admin_controller_page_importance')); - $update_flag = false; - if(isset($_REQUEST['crawl_order']) && - in_array($_REQUEST['crawl_order'], - array_keys($data['available_crawl_orders']))) { + if(!$no_further_changes && isset($_REQUEST['crawl_order']) + && in_array($_REQUEST['crawl_order'], + array_keys($data['available_crawl_orders']))) { $seed_info['general']['crawl_order'] = $_REQUEST['crawl_order']; $update_flag = true; } $data['crawl_order'] = $seed_info['general']['crawl_order']; - if(isset($_REQUEST['posted'])) { + if(!$no_further_changes && isset($_REQUEST['posted'])) { $seed_info['general']['restrict_sites_by_url'] = (isset($_REQUEST['restrict_sites_by_url'])) ? true : false; @@ -825,7 +848,7 @@ class AdminController extends Controller implements CrawlConstants $site_types = array('allowed_sites','disallowed_sites', 'seed_sites'); foreach($site_types as $type) { - if(isset($_REQUEST[$type])) { + if(!$no_further_changes && isset($_REQUEST[$type])) { $seed_info[$type]['url'] = $this->convertStringCleanUrlsArray( $_REQUEST[$type]); @@ -837,7 +860,10 @@ class AdminController extends Controller implements CrawlConstants ($data['restrict_sites_by_url']) ? "checked='checked'" : ""; $data['SCRIPT'] = "setDisplay('toggle', ". - "'{$data['restrict_sites_by_url']}');"; + "'{$data['restrict_sites_by_url']}');". + " elt('load-options').onchange = ". + "function() { if(elt('load-options').selectedIndex !=". + " 0) { elt('crawloptionsForm').submit(); }};"; if($update_flag) { $this->crawlModel->setSeedInfo($seed_info); $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". diff --git a/controllers/fetch_controller.php b/controllers/fetch_controller.php index 9aef34649..9f2af505e 100755 --- a/controllers/fetch_controller.php +++ b/controllers/fetch_controller.php @@ -140,10 +140,34 @@ class FetchController extends Controller implements CrawlConstants if($info_flag == true) { $info =array(); + $info[self::MEMORY_USAGE] = memory_get_peak_usage(); $info[self::STATUS] = self::CONTINUE_STATE; if(file_exists(CRAWL_DIR."/schedules/crawl_status.txt")) { + $change =false; $crawl_status = unserialize( file_get_contents(CRAWL_DIR."/schedules/crawl_status.txt")); + if(isset($_REQUEST['fetcher_peak_memory'])) { + if(!isset($crawl_status['FETCHER_MEMORY']) || + $_REQUEST['fetcher_peak_memory'] < + $crawl_status['FETCHER_PEAK_MEMORY'] + ) { + $crawl_status['FETCHER_PEAK_MEMORY'] = + $_REQUEST['fetcher_peak_memory']; + $change = true; + } + + } + if(!isset($crawl_status['WEBAPP_PEAK_MEMORY']) || + $info[self::MEMORY_USAGE] > + $crawl_status['WEBAPP_PEAK_MEMORY']) { + $crawl_status['WEBAPP_PEAK_MEMORY'] = + $info[self::MEMORY_USAGE]; + $change = true; + } + if($change == true) { + file_put_contents(CRAWL_DIR."/schedules/crawl_status.txt", + serialize($crawl_status)); + } $info[self::CRAWL_TIME] = $crawl_status['CRAWL_TIME']; } else { $info[self::CRAWL_TIME] = 0; diff --git a/lib/index_archive_bundle.php b/lib/index_archive_bundle.php index 72f90010c..6ce39b8da 100644 --- a/lib/index_archive_bundle.php +++ b/lib/index_archive_bundle.php @@ -212,7 +212,8 @@ class IndexArchiveBundle implements IndexingConstants, CrawlConstants * to use in the summmaries WebArchiveBundle * @param int $num_partitions_index number of WebArchive partitions * to use in the index WebArchiveBundle - * @param string $description a short text name for this IndexArchiveBundle + * @param string $description a text name/serialized info about this + * IndexArchiveBundle */ public function __construct($dir_name, $filter_size = -1, $num_partitions_summaries = NULL, $num_partitions_index = NULL, diff --git a/lib/processors/html_processor.php b/lib/processors/html_processor.php index 1b18d3448..4dbc73758 100755 --- a/lib/processors/html_processor.php +++ b/lib/processors/html_processor.php @@ -215,7 +215,8 @@ class HtmlProcessor extends TextProcessor if($i < MAX_LINKS_PER_PAGE) { $url = UrlParser::canonicalLink( $href->getAttribute('href'), $site); - if(!UrlParser::checkRecursiveUrl($url)) { + if(!UrlParser::checkRecursiveUrl($url) && + strlen($url) < MAX_URL_LENGTH) { if(isset($sites[$url])) { $sites[$url] .=" ".strip_tags($href->textContent); } else { @@ -234,8 +235,9 @@ class HtmlProcessor extends TextProcessor $url = UrlParser::canonicalLink( $frame->getAttribute('src'), $site); - if(!UrlParser::checkRecursiveUrl($url)) { - if(isset($sites[$url])) { + if(!UrlParser::checkRecursiveUrl($url) + && strlen($url) < MAX_URL_LENGTH) { + if(isset($sites[$url]) ) { $sites[$url] .=" HTMLframe"; } else { $sites[$url] = "HTMLframe"; @@ -258,8 +260,9 @@ class HtmlProcessor extends TextProcessor $url = UrlParser::canonicalLink( $img->getAttribute('src'), $site); - if(!UrlParser::checkRecursiveUrl($url)) { - if(isset($sites[$url])) { + if(!UrlParser::checkRecursiveUrl($url) + && strlen($url) < MAX_URL_LENGTH) { + if(isset($sites[$url]) ) { $sites[$url] .=" ".$alt; } else { $sites[$url] = $alt; diff --git a/lib/processors/text_processor.php b/lib/processors/text_processor.php index a3fae469c..c98580447 100755 --- a/lib/processors/text_processor.php +++ b/lib/processors/text_processor.php @@ -121,7 +121,7 @@ class TextProcessor implements CrawlConstants preg_match_all($pattern, $page, $matches); $i = 0; foreach($matches[0] as $url) { - if(!isset($sites[$url])) { + if(!isset($sites[$url]) && strlen($url) < MAX_URL_LENGTH) { $sites[$url] = strip_tags($url); $i++; if($i >= MAX_LINKS_PER_PAGE) {break;} diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 79aca6c97..5045c370e 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "Stopping crawl. . .This will take a moment to ref ; admin_controller.php line: 738 admin_controller_resume_crawl = "Resuming crawl. . .This will take a moment to refresh." ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "Deleting Crawl. . .This will take a moment to refresh." ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "Delete Crawl Failed!!" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "Setting Crawl To Use as Index" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "Use options below" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "Use Yioop! defaults" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "Previous Crawl:" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "Breadth First" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "Page Importance" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "Updating Seed Site Info!" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "Select Locale" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "Locale Added!" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "Locale Does Not Exist!" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "Locale Deleted" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "Locale Strings Updated!" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "Please Name Your robot" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "Unable to Update config.php File!" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "Unable to Create Profile!" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "Problem Updating Database!" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "Profile Updated!" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "Please Describe Your Robot" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "Time started:" crawlstatus_view_no_crawl_time = "No start time found" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "Server Peak Memory:" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "No Memory Data Yet" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "Fetcher Peak Memory:" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "No Memory Data Yet" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "WebApp Peak Memory:" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "No Memory Data Yet" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "Visited Urls Count:" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "Total Urls Extracted:" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "Most Recent Fetcher:" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "No Fetcher Queries Yet" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "Most Recent Urls" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "No Recent Urls" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "Previous Crawls" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "Description:" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "Timestamp:" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "Visited/Extracted Urls:" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "Actions:" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "Resume" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "Set as Index" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "Search Index" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "Delete" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "No Previous Crawls" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "Back" crawloptions_element_edit_crawl_options = "Edit Crawl Options" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "Crawl Order:" +crawloptions_element_load_options = "Get Crawl Options From:" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "Crawl Order:" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "Restrict Sites By Url:" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "Allowed To Crawl Sites" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "Disallowed Sites" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "Seed Sites" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "Save Options" ; ; editlocales_element.php line: 62 diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 1dffc287b..6b1852b76 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/fr-FR/statistics.txt b/locale/fr-FR/statistics.txt index 604edd026..763247d34 100755 --- a/locale/fr-FR/statistics.txt +++ b/locale/fr-FR/statistics.txt @@ -1 +1 @@ -d:18; \ No newline at end of file +d:17; \ No newline at end of file diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 5148d447c..57754abdc 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index cbf6abf0a..ad3d215f2 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "Pilih name locale" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "Locale telah ditambah" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "Locale tidak ditemukan" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "Locale telah dihapus" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/in-ID/statistics.txt b/locale/in-ID/statistics.txt index 36ca4c26d..0f66448e8 100755 --- a/locale/in-ID/statistics.txt +++ b/locale/in-ID/statistics.txt @@ -1 +1 @@ -d:25; \ No newline at end of file +d:24; \ No newline at end of file diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 13d45787e..ba84d9365 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "検索を停止する。ちょっと待ってく ; admin_controller.php line: 738 admin_controller_resume_crawl = "検索を再会する。ちょっと待ってください。" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "検索を削除する。ちょっと待ってください。" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "検索削除を失敗しました" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "指数のための検索設定する。" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "幅優先" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "ページの重要性" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "シッド情報の更新" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "選択ローケル" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "ローケルが追加しました" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "ローケルは存在しません" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "ローケルを削除しました" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "ローケルストリングを編集しました" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "ボット名を入力してください。" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "config.phpファイルのできない。更新" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "プロフィールを作成できない。" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "ディータベースの更新ない" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "プロフィールの変更できました。" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "プロフィールの変更できない。" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "ロボットの説明してください。" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "始まった時の時間" crawlstatus_view_no_crawl_time = "検索始まった時間は見つけない" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "全部URL" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "最新フェッチャ" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "フェッチャキュエリはまだありません" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "最新URL" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "最近URLはありません" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "さっきの検索" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "説明" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "アクション" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "再会" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "指数の設定する。" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "検索指数" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "削除" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "さっきの検索はありません" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "戻る" crawloptions_element_edit_crawl_options = "検索オプションの編集" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "検索の順序" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "検索の順序" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "URLで制限" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "検索ができます" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "検索はできません" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "シッドサイト" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "保存オプション" ; ; editlocales_element.php line: 62 diff --git a/locale/ja/statistics.txt b/locale/ja/statistics.txt index a88e2a194..8250db870 100755 --- a/locale/ja/statistics.txt +++ b/locale/ja/statistics.txt @@ -1 +1 @@ -d:97; \ No newline at end of file +d:93; \ No newline at end of file diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index dcc998267..fc2378223 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "크롤을 중지합니다. 잠시만 기다려 ; admin_controller.php line: 738 admin_controller_resume_crawl = "크롤을 다시 시작합니다. 잠시만 기다려 주십시요." ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "크롤을 삭제합니다. 잠시만 기다려 주십시요." ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "크롤 삭제 실패!!" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "크롤을 인덱스로써 사용하기 지정" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "로케일을 선택하여 주십시요." ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "로케일 추가!!" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "로케일이 존재하지 않습니다." ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "로케일을 삭제 하였습니다." ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "로케일 지정 문자열을 업데이트 하였습니다." ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "시작한 시간:" crawlstatus_view_no_crawl_time = "시작 시간이 존재하지 않습니다." ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "지금까지 본 총 합계 주소(URLs):" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "설명:" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/ko/statistics.txt b/locale/ko/statistics.txt index b26155324..039ce78b2 100755 --- a/locale/ko/statistics.txt +++ b/locale/ko/statistics.txt @@ -1 +1 @@ -d:31; \ No newline at end of file +d:30; \ No newline at end of file diff --git a/locale/rn-US/configure.ini b/locale/rn-US/configure.ini index 1f56213f6..87dc464ab 100755 --- a/locale/rn-US/configure.ini +++ b/locale/rn-US/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 9fe1ff3e8..075363593 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 3d286600a..1c8deccee 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "Ngừng thu thập dữ liệu" ; admin_controller.php line: 738 admin_controller_resume_crawl = "Tiếp tục thu thập dữ liệu" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "Xóa thu thập dữ liệu thành công" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "Xóa thu thập dữ liệu không thành công" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "Thiết lập thu thập dữ liệu để sử dụng làm chỉ mục" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "Bề rộng đầu tiên" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "Trang quan trọng" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "Cập nhật thông tin trang web hạt giống" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "Chọn miền địa phương" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "Miền địa phương thêm vào" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "Miền địa phương không tồn tại" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "Xóa miền địa phương" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "Chuỗi Địa phương được cập nhật" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "Công việc thiết lập thư mục bị đông cứng (Bạn có thể cần phải đăng nhập)" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "Đặt tên cho rô bô của bạn" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "Thư mục làm việc và hồ sơ được tạo ra" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "Không thể cập nhật hồ sơ config.php" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "Không thể tạo hồ sơ" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "Hồ sơ được cập nhật" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "Có sự trở ngaị về việc cập nhật hồ sơ " ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "Diễn tả rô bô của bạn" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "Thời gian bắt đầu:" crawlstatus_view_no_crawl_time = "Không tìm thấy thời gian bắt đầu" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "Mô tả:" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "Những hành động:" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "Bắt đầu trở lại" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "Cài làm mục lục" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "Tìm mục lục" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "Xoá" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "Trở lại" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "Lưu những lựa chọn" ; ; editlocales_element.php line: 62 diff --git a/locale/vi-VN/statistics.txt b/locale/vi-VN/statistics.txt index d1d9ed5ab..f1d708b66 100755 --- a/locale/vi-VN/statistics.txt +++ b/locale/vi-VN/statistics.txt @@ -1 +1 @@ -d:72; \ No newline at end of file +d:69; \ No newline at end of file diff --git a/locale/vn-US/configure.ini b/locale/vn-US/configure.ini index 924ff573e..9d22800a7 100755 --- a/locale/vn-US/configure.ini +++ b/locale/vn-US/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index a99e0cdae..006276548 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -130,70 +130,79 @@ admin_controller_stop_crawl = "" ; admin_controller.php line: 738 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 773 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 774 +; admin_controller.php line: 778 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 781 +; admin_controller.php line: 785 admin_controller_set_index = "" ; -; admin_controller.php line: 794 +; admin_controller.php line: 797 +admin_controller_use_below = "" +; +; admin_controller.php line: 798 +admin_controller_use_defaults = "" +; +; admin_controller.php line: 801 +admin_controller_previous_crawl = "" +; +; admin_controller.php line: 807 admin_controller_breadth_first = "" ; -; admin_controller.php line: 796 +; admin_controller.php line: 809 admin_controller_page_importance = "" ; -; admin_controller.php line: 835 +; admin_controller.php line: 848 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 916 admin_controller_select_localename = "" ; -; admin_controller.php line: 946 +; admin_controller.php line: 959 admin_controller_locale_added = "" ; -; admin_controller.php line: 953 +; admin_controller.php line: 966 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 962 +; admin_controller.php line: 975 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 982 +; admin_controller.php line: 995 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1060 +; admin_controller.php line: 1073 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1072 +; admin_controller.php line: 1085 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1081 +; admin_controller.php line: 1094 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1087 +; admin_controller.php line: 1100 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1098 +; admin_controller.php line: 1111 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1107 +; admin_controller.php line: 1120 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1118 +; admin_controller.php line: 1131 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1178 +; admin_controller.php line: 1191 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1192 +; admin_controller.php line: 1205 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1206 +; admin_controller.php line: 1219 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1240 +; admin_controller.php line: 1253 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -232,51 +241,69 @@ crawlstatus_view_time_started = "" crawlstatus_view_no_crawl_time = "" ; ; crawlstatus_view.php line: 78 +crawlstatus_view_queue_memory = "" +; +; crawlstatus_view.php line: 83 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 86 +crawlstatus_view_fetcher_memory = "" +; +; crawlstatus_view.php line: 91 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 94 +crawlstatus_view_webapp_memory = "" +; +; crawlstatus_view.php line: 99 +crawlstatus_view_no_mem_data = "" +; +; crawlstatus_view.php line: 102 crawlstatus_view_visited_urls = "" ; -; crawlstatus_view.php line: 82 +; crawlstatus_view.php line: 106 crawlstatus_view_total_urls = "" ; -; crawlstatus_view.php line: 85 +; crawlstatus_view.php line: 109 crawlstatus_view_most_recent_fetcher = "" ; -; crawlstatus_view.php line: 91 +; crawlstatus_view.php line: 115 crawlstatus_view_no_fetcher = "" ; -; crawlstatus_view.php line: 94 +; crawlstatus_view.php line: 119 crawlstatus_view_most_recent_urls = "" ; -; crawlstatus_view.php line: 102 +; crawlstatus_view.php line: 127 crawlstatus_view_no_recent_urls = "" ; -; crawlstatus_view.php line: 106 +; crawlstatus_view.php line: 131 crawlstatus_view_previous_crawls = "" ; -; crawlstatus_view.php line: 112 +; crawlstatus_view.php line: 137 crawlstatus_view_description = "" ; -; crawlstatus_view.php line: 113 +; crawlstatus_view.php line: 138 crawlstatus_view_timestamp = "" ; -; crawlstatus_view.php line: 114 +; crawlstatus_view.php line: 139 crawlstatus_view_url_counts = "" ; -; crawlstatus_view.php line: 115 +; crawlstatus_view.php line: 140 crawlstatus_view_actions = "" ; -; crawlstatus_view.php line: 128 +; crawlstatus_view.php line: 153 crawlstatus_view_resume = "" ; -; crawlstatus_view.php line: 134 +; crawlstatus_view.php line: 159 crawlstatus_view_set_index = "" ; -; crawlstatus_view.php line: 137 +; crawlstatus_view.php line: 162 crawlstatus_view_search_index = "" ; -; crawlstatus_view.php line: 144 +; crawlstatus_view.php line: 169 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 151 +; crawlstatus_view.php line: 176 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements @@ -354,21 +381,24 @@ crawloptions_element_back_to_manage = "" crawloptions_element_edit_crawl_options = "" ; ; crawloptions_element.php line: 74 -crawloptions_element_crawl_order = "" +crawloptions_element_load_options = "" ; ; crawloptions_element.php line: 79 +crawloptions_element_crawl_order = "" +; +; crawloptions_element.php line: 84 crawloptions_element_restrict_by_url = "" ; -; crawloptions_element.php line: 86 +; crawloptions_element.php line: 91 crawloptions_element_allowed_to_crawl = "" ; -; crawloptions_element.php line: 91 +; crawloptions_element.php line: 96 crawloptions_element_disallowed_to_crawl = "" ; -; crawloptions_element.php line: 97 +; crawloptions_element.php line: 102 crawloptions_element_seed_sites = "" ; -; crawloptions_element.php line: 102 +; crawloptions_element.php line: 107 crawloptions_element_save_options = "" ; ; editlocales_element.php line: 62 diff --git a/locale/zh-CN/statistics.txt b/locale/zh-CN/statistics.txt index 039ce78b2..9a3fa5a61 100755 --- a/locale/zh-CN/statistics.txt +++ b/locale/zh-CN/statistics.txt @@ -1 +1 @@ -d:30; \ No newline at end of file +d:29; \ No newline at end of file diff --git a/models/crawl_model.php b/models/crawl_model.php index 03d9d95a2..f88bd594c 100755 --- a/models/crawl_model.php +++ b/models/crawl_model.php @@ -190,7 +190,8 @@ class CrawlModel extends Model implements CrawlConstants $crawl['CRAWL_TIME'] = substr($pre_timestamp, strlen(self::index_data_base_name)); $info = IndexArchiveBundle::getArchiveInfo($dir); - $crawl['DESCRIPTION'] = $info['DESCRIPTION']; + $index_info = unserialize($info['DESCRIPTION']); + $crawl['DESCRIPTION'] = $index_info['DESCRIPTION']; $crawl['VISITED_URLS_COUNT'] = isset($info['VISITED_URLS_COUNT']) ? $info['VISITED_URLS_COUNT'] : 0; @@ -203,25 +204,71 @@ class CrawlModel extends Model implements CrawlConstants return $list; } + /** + * Returns the crawl parameters that were used during a given crawl + * + * @param string $timestamp timestamp of the crawl to load the crawl + * parameters of + * @return array the first sites to crawl during the next crawl + * restrict_by_url, allowed, disallowed_sites + */ + function getCrawlSeedInfo($timestamp) + { + $dir = CRAWL_DIR.'/cache/'.self::index_data_base_name.$timestamp; + $seed_info = NULL; + if(file_exists($dir)) { + $info = IndexArchiveBundle::getArchiveInfo($dir); + $index_info = unserialize($info['DESCRIPTION']); + $seed_info['general']["restrict_sites_by_url"] = + $index_info[self::RESTRICT_SITES_BY_URL]; + $seed_info['general']["crawl_order"] = + $index_info[self::CRAWL_ORDER]; + $site_types = array( + "allowed_sites" => self::ALLOWED_SITES, + "disallowed_sites" => self::DISALLOWED_SITES, + "seed_sites" => self::TO_CRAWL + ); + foreach($site_types as $type => $code) { + if(isset($index_info[$code])) { + $tmp = & $index_info[$code]; + } else { + $tmp = array(); + } + $seed_info[$type]['url'] = + $tmp; + } + + } + return $seed_info; + } + /** * Returns the initial sites that a new crawl will start with along with * crawl parameters such as crawl order, allowed and disallowed crawl sites - * + * @param bool $use_default whether or not to use the Yioop! default + * crawl.ini file rather than the one created by the user. * @return array the first sites to crawl during the next crawl + * restrict_by_url, allowed, disallowed_sites */ - function getSeedInfo() + function getSeedInfo($use_default = false) { - if(file_exists(WORK_DIRECTORY."/crawl.ini")) { + if(file_exists(WORK_DIRECTORY."/crawl.ini") && !$use_default) { $info = parse_ini_file (WORK_DIRECTORY."/crawl.ini", true); } else { $info = parse_ini_file (BASE_DIR."/configs/default_crawl.ini", true); } - + return $info; + } /** - * + * Writes a crawl.ini file with the provided data to the user's + * WORK_DIRECTORY + * + * @param array $info an array containing information about the crawl + * such as crawl_order, whether restricted_by_url, seed_sites, + * allowed_sites and disallowed_sites */ function setSeedInfo($info) { diff --git a/views/crawlstatus_view.php b/views/crawlstatus_view.php index 8222fa283..eca1c8307 100755 --- a/views/crawlstatus_view.php +++ b/views/crawlstatus_view.php @@ -76,6 +76,30 @@ class CrawlstatusView extends View <?php if(isset($data['CRAWL_TIME'])) { e(date("r",$data['CRAWL_TIME'])); } else {e(tl('crawlstatus_view_no_crawl_time'));} ?></p> + <p><b><?php e(tl('crawlstatus_view_queue_memory')); ?></b> + <?php + if(isset($data['QUEUE_PEAK_MEMORY'])) { + e($data['QUEUE_PEAK_MEMORY']); + } else { + e(tl('crawlstatus_view_no_mem_data')); + } ?> + </p> + <p><b><?php e(tl('crawlstatus_view_fetcher_memory')); ?></b> + <?php + if(isset($data['FETCHER_PEAK_MEMORY'])) { + e($data['FETCHER_PEAK_MEMORY']); + } else { + e(tl('crawlstatus_view_no_mem_data')); + } ?> + </p> + <p><b><?php e(tl('crawlstatus_view_webapp_memory')); ?></b> + <?php + if(isset($data['WEBAPP_PEAK_MEMORY'])) { + e($data['WEBAPP_PEAK_MEMORY']); + } else { + e(tl('crawlstatus_view_no_mem_data')); + } ?> + </p> <p><b><?php e(tl('crawlstatus_view_visited_urls')); ?></b> <?php if(isset($data['VISITED_URLS_COUNT'])) { e($data['VISITED_URLS_COUNT']); } else {e("0");} @@ -92,6 +116,7 @@ class CrawlstatusView extends View e(tl('crawlstatus_view_no_fetcher')); } ?></p> + <h2><?php e(tl('crawlstatus_view_most_recent_urls')); ?></h2> <?php if(isset($data['MOST_RECENT_URLS_SEEN']) && diff --git a/views/elements/crawloptions_element.php b/views/elements/crawloptions_element.php index a33732846..e72d0131d 100644 --- a/views/elements/crawloptions_element.php +++ b/views/elements/crawloptions_element.php @@ -71,11 +71,17 @@ class CrawloptionsElement extends Element <input type="hidden" name="a" value="manageCrawl" /> <input type="hidden" name="arg" value="options" /> <input type="hidden" name="posted" value="posted" /> + <div class="topmargin"><label for="crawl-order"><b><?php + e(tl('crawloptions_element_load_options'))?></b></label><?php + $this->view->optionsHelper->render("load-options", "load_option", + $data['available_options'], $data['options_default']); + ?></div> <div class="topmargin"><label for="crawl-order"><b><?php e(tl('crawloptions_element_crawl_order'))?></b></label><?php $this->view->optionsHelper->render("crawl-order", "crawl_order", $data['available_crawl_orders'], $data['crawl_order']); - ?></div> + ?> + </div> <div class="topmargin"><label for="restrict-sites-by-url"><b><?php e(tl('crawloptions_element_restrict_by_url'))?></b></label> <input type="checkbox" id="restrict-sites-by-url"