diff --git a/bin/fetcher.php b/bin/fetcher.php index 5caeb10e2..c11a207cf 100755 --- a/bin/fetcher.php +++ b/bin/fetcher.php @@ -137,11 +137,30 @@ class Fetcher implements CrawlConstants * @var object */ var $db; + /** - * Url or IP address of the queue_server to get sites to crawl from - * @var string + * Urls or IP address of the web_server used to administer this instance + * of yioop. Used to figure out available queue_servers to contact + * for crawling data + * + * @var array + */ + var $name_server; + + /** + * Array of Urls or IP addresses of the queue_servers to get sites to crawl + * from + * @var array + */ + var $queue_servers; + + /** + * Index into $queue_servers of the server get schedule from (or last one + * we got the schedule from) + * @var int */ - var $queue_server; + var $current_server; + /** * An associative array of (mimetype => name of processor class to handle) * pairs. @@ -175,7 +194,7 @@ class Fetcher implements CrawlConstants */ var $crawl_time; /** - * Contains the list of web pages to crawl from the queue_server + * Contains the list of web pages to crawl from a queue_server * @var array */ var $to_crawl; @@ -187,12 +206,12 @@ class Fetcher implements CrawlConstants var $to_crawl_again; /** * Summary information for visited sites that the fetcher hasn't sent to - * the queue_server yet + * a queue_server yet * @var array */ var $found_sites; /** - * Timestamp from the queue_server of the current schedule of sites to + * Timestamp from a queue_server of the current schedule of sites to * download. This is sent back to the server once this schedule is completed * to help the queue server implement crawl-delay if needed. * @var int @@ -224,7 +243,7 @@ class Fetcher implements CrawlConstants /** * Stores the name of the ordering used to crawl pages. This is used in a * switch/case when computing weights of urls to be crawled before sending - * these new urls back to the queue_server. + * these new urls back to a queue_server. * @var string */ var $crawl_order; @@ -251,7 +270,7 @@ class Fetcher implements CrawlConstants var $archive_iterator; /** - * Keeps track of whether during the recrawl we should notify the + * Keeps track of whether during the recrawl we should notify a * queue_server scheduler about our progress in mini-indexing documents * in the archive * @var bool @@ -275,17 +294,20 @@ class Fetcher implements CrawlConstants * Sets up the field variables so that crawling can begin * * @param array $page_processors (mimetype => name of processor) pairs - * @param string $queue_server URL or IP address of the queue server + * @param string $name_server URL or IP address of the queue server * @param int $page_range_request maximum number of bytes to download from * a webpage; <=0 -- unlimited */ - function __construct($page_processors, $queue_server, + function __construct($page_processors, $name_server, $page_range_request) { $db_class = ucfirst(DBMS)."Manager"; $this->db = new $db_class(); - $this->queue_server = $queue_server; + // initially same only one queueserver and is same as name server + $this->name_server = $name_server; + $this->queue_servers = array($name_server); + $this->current_server = 0; $this->page_processors = $page_processors; $this->meta_words = array(); @@ -308,7 +330,7 @@ class Fetcher implements CrawlConstants $this->sum_seen_site_link_length = 0; $this->num_seen_sites = 0; - //we will get the correct crawl order from the queue_server + //we will get the correct crawl order from a queue_server $this->crawl_order = self::PAGE_IMPORTANCE; } @@ -617,7 +639,7 @@ class Fetcher implements CrawlConstants */ function checkCrawlTime() { - $queue_server = $this->queue_server; + $name_server = $this->name_server; $start_time = microtime(); $time = time(); @@ -633,7 +655,7 @@ class Fetcher implements CrawlConstants */ $robot_instance = $prefix . ROBOT_INSTANCE; $request = - $queue_server."?c=fetch&a=crawlTime&time=$time&session=$session". + $name_server."?c=fetch&a=crawlTime&time=$time&session=$session". "&robot_instance=".$robot_instance."&machine_uri=".WEB_URI; $info_string = FetchUrl::getPage($request); @@ -649,6 +671,14 @@ class Fetcher implements CrawlConstants $this->to_crawl = array(); $this->to_crawl_again = array(); $this->found_sites = array(); + if(isset($info[self::QUEUE_SERVERS])) { + $this->queue_servers = $info[self::QUEUE_SERVERS]; + if(!isset($this->current_server) || + $this->current_server > count($info[self::QUEUE_SERVERS])) { + $this->current_server = 0; + } + } + if($this->crawl_time > 0) { file_put_contents("$dir/$prefix".self::fetch_closed_name. "{$this->crawl_time}.txt", "1"); @@ -716,8 +746,10 @@ class Fetcher implements CrawlConstants return true; } + $this->current_server = ($this->current_server + 1) + % count($this->queue_servers); $this->recrawl_check_scheduler = false; - $queue_server = $this->queue_server; + $queue_server = $this->queue_servers[$this->current_server]; $start_time = microtime(); $time = time(); @@ -730,6 +762,8 @@ class Fetcher implements CrawlConstants $info_string = FetchUrl::getPage($request); if($info_string === false) { + crawlLog("The following request failed:"); + crawlLog($request); return false; } $info_string = trim($info_string); @@ -776,6 +810,19 @@ class Fetcher implements CrawlConstants */ function setCrawlParamsFromArray(&$info) { + /* QUEUE_SERVERS and CURRENT_SERVER might not be set if info came + from a queue_server rather than from name server + */ + if(isset($info[self::QUEUE_SERVERS])) { + $this->queue_servers = $info[self::QUEUE_SERVERS]; + } else { + $info[self::QUEUE_SERVERS] = $this->queue_servers; + } + if(isset($info[self::CURRENT_SERVER])) { + $this->current_server = $info[self::CURRENT_SERVER]; + } else { + $info[self::CURRENT_SERVER] = $this->current_server; + } if(isset($info[self::CRAWL_TYPE])) { $this->crawl_type = $info[self::CRAWL_TYPE]; } @@ -1375,10 +1422,14 @@ class Fetcher implements CrawlConstants break; } $count = count($link_urls); + $num_queue_servers = count($this->queue_servers); for($i = 0; $i < $count; $i++) { - if(strlen($link_urls[$i]) > 0) { - $this->found_sites[self::TO_CRAWL][] = - array($link_urls[$i], $weight, $site_hash.$i); + $url = $link_urls[$i]; + if(strlen($url) > 0) { + $part = calculatePartition($url, $num_queue_servers, + "UrlParser::getHost"); + $this->found_sites[self::TO_CRAWL][$part][] = + array($url, $weight, $site_hash.$i); } } } @@ -1397,7 +1448,7 @@ class Fetcher implements CrawlConstants */ function updateScheduler() { - $queue_server = $this->queue_server; + $queue_server = $this->queue_servers[$this->current_server]; $prefix = ""; if($this->fetcher_num !== false) { @@ -1428,11 +1479,11 @@ class Fetcher implements CrawlConstants //handle schedule data $schedule_data = array(); - if(isset($this->found_sites[self::TO_CRAWL])) { + if(isset($this->found_sites[self::TO_CRAWL][$this->current_server])) { $schedule_data[self::TO_CRAWL] = & - $this->found_sites[self::TO_CRAWL]; + $this->found_sites[self::TO_CRAWL][$this->current_server]; } - unset($this->found_sites[self::TO_CRAWL]); + unset($this->found_sites[self::TO_CRAWL][$this->current_server]); $seen_cnt = 0; if(isset($this->found_sites[self::SEEN_URLS]) && @@ -1460,7 +1511,8 @@ class Fetcher implements CrawlConstants $this->buildMiniInvertedIndex(); } crawlLog("..."); - if(isset($this->found_sites[self::INVERTED_INDEX])) { + if(isset($this->found_sites[self::INVERTED_INDEX][ + $this->current_server])) { $compress_urls = ""; while($this->found_sites[self::SEEN_URLS] != array()) { $site = array_shift($this->found_sites[self::SEEN_URLS]); @@ -1471,14 +1523,15 @@ class Fetcher implements CrawlConstants $len_urls = strlen($compress_urls); crawlLog("...Finish Compressing seen URLs."); $post_data['index_data'] = webencode( packInt($len_urls). - $compress_urls. $this->found_sites[self::INVERTED_INDEX] + $compress_urls. $this->found_sites[self::INVERTED_INDEX][ + $this->current_server] ); // don't compress index data unset($compress_urls); - unset($this->found_sites[self::INVERTED_INDEX]); + unset($this->found_sites[self::INVERTED_INDEX][ + $this->current_server]); $bytes_to_send += strlen($post_data['index_data']); } - $this->found_sites = array(); // reset found_sites so have more space. if($bytes_to_send <= 0) { crawlLog("No data to send aborting update scheduler..."); return; @@ -1532,7 +1585,7 @@ class Fetcher implements CrawlConstants /** * Builds an inverted index shard (word --> {docs it appears in}) * for the current batch of SEEN_URLS_BEFORE_UPDATE_SCHEDULER many pages. - * This inverted index shard is then merged by the queue_server + * This inverted index shard is then merged by a queue_server * into the inverted index of the current generation of the crawl. * The complete inverted index for the whole crawl is built out of these * inverted indexes for generations. The point of computing a partial @@ -1554,7 +1607,10 @@ class Fetcher implements CrawlConstants for the fetcher we are not saving the index shards so name doesn't matter. */ - $index_shard = new IndexShard("fetcher_shard"); + if(!isset($this->found_sites[self::INVERTED_INDEX][ + $this->current_server])) + $this->found_sites[self::INVERTED_INDEX][$this->current_server] = + new IndexShard("fetcher_shard_{$this->current_server}"); for($i = 0; $i < $num_seen; $i++) { $site = $this->found_sites[self::SEEN_URLS][$i]; if(!isset($site[self::HASH])) {continue; } @@ -1605,11 +1661,13 @@ class Fetcher implements CrawlConstants $link_rank = false; } $had_links = false; - + $num_queue_servers = count($this->queue_servers); foreach($site[self::LINKS] as $url => $link_text) { $link_meta_ids = array(); $location_link = false; if(strlen($url) > 0) { + $part_num = calculatePartition($url, + $num_queue_servers, "UrlParser::getHost"); $summary = array(); if(substr($link_text, 0, 9) == "location:") { $location_link = true; @@ -1652,10 +1710,15 @@ class Fetcher implements CrawlConstants $link_word_lists = PhraseParser::extractPhrasesInLists($link_text, MAX_PHRASE_LEN, $lang); - - $index_shard->addDocumentWords($link_keys, - self::NEEDS_OFFSET_FLAG, - $link_word_lists, $link_meta_ids, false, $link_rank); + if(!isset($this->found_sites[self::INVERTED_INDEX][ + $part_num])) { + $this->found_sites[self::INVERTED_INDEX][$part_num] = + new IndexShard("fetcher_shard_$part_num"); + } + $this->found_sites[self::INVERTED_INDEX][ + $part_num]->addDocumentWords($link_keys, + self::NEEDS_OFFSET_FLAG, $link_word_lists, + $link_meta_ids, false, $link_rank); $meta_ids[] = 'link:'.$url; $meta_ids[] = 'link:'.crawlHash($url); @@ -1664,12 +1727,15 @@ class Fetcher implements CrawlConstants } - $index_shard->addDocumentWords($doc_keys, self::NEEDS_OFFSET_FLAG, + $this->found_sites[self::INVERTED_INDEX][$this->current_server + ]->addDocumentWords($doc_keys, self::NEEDS_OFFSET_FLAG, $word_lists, $meta_ids, true, $doc_rank); } - $this->found_sites[self::INVERTED_INDEX] = $index_shard->save(true); + $this->found_sites[self::INVERTED_INDEX][$this->current_server] = + $this->found_sites[self::INVERTED_INDEX][ + $this->current_server]->save(true); if($this->crawl_type == self::ARCHIVE_CRAWL) { $this->recrawl_check_scheduler = true; @@ -1791,7 +1857,7 @@ class Fetcher implements CrawlConstants /* * Instantiate and runs the Fetcher */ -$fetcher = new Fetcher($PAGE_PROCESSORS, QUEUE_SERVER, +$fetcher = new Fetcher($PAGE_PROCESSORS, NAME_SERVER, PAGE_RANGE_REQUEST); $fetcher->start(); diff --git a/bin/mirror.php b/bin/mirror.php index 49aaced3b..d685e8268 100644 --- a/bin/mirror.php +++ b/bin/mirror.php @@ -96,10 +96,10 @@ class Mirror implements CrawlConstants */ var $db; /** - * Url or IP address of the queue_server to get sites to crawl from + * Url or IP address of the name_server to get sites to crawl from * @var string */ - var $queue_server; + var $name_server; /** * Last time a sync list was obtained from master machines @@ -146,14 +146,14 @@ class Mirror implements CrawlConstants /** * Sets up the field variables so that syncing can begin * - * @param string $queue_server URL or IP address of the queue server + * @param string $name_server URL or IP address of the name server */ - function __construct($queue_server) + function __construct($name_server) { $db_class = ucfirst(DBMS)."Manager"; $this->db = new $db_class(); - $this->queue_server = $queue_server; + $this->name_server = $name_server; $this->last_sync_file = CRAWL_DIR."/schedules/last_sync.txt"; if(file_exists($this->last_sync_file)) { $this->last_sync = unserialize( @@ -239,13 +239,13 @@ class Mirror implements CrawlConstants $info = array(); - $queue_server = $this->queue_server; + $name_server = $this->name_server; $start_time = microtime(); $time = time(); $session = md5($time . AUTH_KEY); $request = - $queue_server. + $name_server. "?c=resource&time=$time&session=$session". "&robot_instance=".ROBOT_INSTANCE."&machine_uri=".WEB_URI. "&last_sync=".$this->last_sync; @@ -293,7 +293,7 @@ class Mirror implements CrawlConstants function copyNextSyncFile() { $dir = $this->sync_dir; - $queue_server = $this->queue_server; + $name_server = $this->name_server; $time = time(); $session = md5($time . AUTH_KEY); if(count($this->sync_schedule) <= 0) return; @@ -308,7 +308,7 @@ class Mirror implements CrawlConstants } } else { $request = - "$queue_server?c=resource&a=get&time=$time&session=$session". + "$name_server?c=resource&a=get&time=$time&session=$session". "&robot_instance=".ROBOT_INSTANCE."&machine_uri=".WEB_URI. "&last_sync=".$this->last_sync."&f=cache&n=". urlencode($file["name"]); @@ -350,7 +350,7 @@ class Mirror implements CrawlConstants /* * Instantiate and runs the Fetcher */ -$syncer = new Mirror(QUEUE_SERVER); +$syncer = new Mirror(NAME_SERVER); $syncer->start(); ?> diff --git a/bin/queue_server.php b/bin/queue_server.php index ace25261b..e81d2df6f 100755 --- a/bin/queue_server.php +++ b/bin/queue_server.php @@ -348,8 +348,8 @@ class QueueServer implements CrawlConstants, Join } while ($info[self::STATUS] != self::STOP_STATE) { $server_name = ($this->server_type != self::BOTH) ? - $this->server_type : ""; - crawlLog("$this->server_type Peak memory usage so far". + $this->server_type : "Queue server"; + crawlLog("$server_name peak memory usage so far". memory_get_peak_usage()."!!"); $info = $this->handleAdminMessages($info); @@ -384,7 +384,7 @@ class QueueServer implements CrawlConstants, Join } } - crawlLog("Queue Server shutting down!!"); + crawlLog("$server_name shutting down!!"); } /** @@ -400,7 +400,9 @@ class QueueServer implements CrawlConstants, Join */ function processCrawlData($blocking = false) { - crawlLog("Process Crawl Data Method ({$this->server_type})"); + $server_name = ($this->server_type != self::BOTH) ? $this->server_type : + ""; + crawlLog("$server_name Entering Process Crawl Data Method "); if($this->isAIndexer()) { $this->processIndexData($blocking); if(time() - $this->last_index_save_time > FORCE_SAVE_TIME){ @@ -1231,8 +1233,10 @@ class QueueServer implements CrawlConstants, Join $blocked = false; } + $server_name = ($this->server_type != self::BOTH) ? $this->server_type : + "Queue server"; crawlLog( - "Start processing ({$this->server_type}) index data memory usage". + "$server_name is starting to process index data, memory usage". memory_get_usage() . "..."); crawlLog("Processing index data in $file..."); @@ -1699,6 +1703,7 @@ class QueueServer implements CrawlConstants, Join */ function calculateScheduleMetaInfo($schedule_time) { + //notice does not contain self::QUEUE_SERVERS $sites = array(); $sites[self::CRAWL_TIME] = $this->crawl_time; $sites[self::SCHEDULE_TIME] = $schedule_time; diff --git a/configs/config.php b/configs/config.php index c1ebc8107..52a6298cd 100755 --- a/configs/config.php +++ b/configs/config.php @@ -97,7 +97,7 @@ if(file_exists(WORK_DIRECTORY."/profile.php")) { define('LOCALE_DIR', FALLBACK_LOCALE_DIR); /** @ignore */ define('LOG_DIR', BASE_DIR."/log"); - define('QUEUE_SERVER', "http://localhost/"); + define('NAME_SERVER', "http://localhost/"); define('USER_AGENT_SHORT', "NeedsNameBot"); /** @ignore */ define('SESSION_NAME', "yioopbiscuit"); @@ -139,7 +139,7 @@ if(!PROFILE) { * a web-server it is crawling */ define('USER_AGENT', - 'Mozilla/5.0 (compatible; '.USER_AGENT_SHORT.' +'.QUEUE_SERVER.'bot.php)'); + 'Mozilla/5.0 (compatible; '.USER_AGENT_SHORT.'; +'.NAME_SERVER.'bot.php)'); /** name of the cookie used to manage the session * (store language and perpage settings) @@ -369,7 +369,7 @@ define ('MINIMUM_FETCH_LOOP_TIME', 5); /** an idling fetcher sleeps this long between queue_server pings*/ define ('FETCH_SLEEP_TIME', 15); -/** an queue_server minimim loop idle time*/ +/** an a queue_server minimum loop idle time*/ define ('QUEUE_SLEEP_TIME', 5); /** How often mirror script tries to synchronize with machine it is mirroring*/ @@ -382,6 +382,9 @@ define ('MIRROR_NOTIFY_FREQUENCY', 60); filters (fetcher) will be force saved in seconds*/ define('FORCE_SAVE_TIME', 3600); + /** Number of seconds of no fetcher contact before crawl is deemed dead*/ +define("CRAWL_TIME_OUT", 1800); + /** maximum number of terms allowed in a conjunctive search query */ define ('MAX_QUERY_TERMS', 10); diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index 4dfe62275..0a8464e49 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -77,8 +77,7 @@ class AdminController extends Controller implements CrawlConstants "manageMachines", "manageLocales", "crawlStatus", "mixCrawls", "machineStatus", "configure"); - /** Number of seconds of no fetcher contact before crawl is deemed dead*/ - const CRAWL_TIME_OUT = 1800; + /** * This is the main entry point for handling requests to administer the @@ -259,53 +258,18 @@ class AdminController extends Controller implements CrawlConstants $data['CURRENT_INDEX'] = -1; } - if(file_exists(CRAWL_DIR."/schedules/crawl_status.txt")) { - //assume if status not updated for self::CRAWL_TIME_OUT - // crawl not active (do check for both scheduler and indexer) - if(filemtime( - CRAWL_DIR."/schedules/crawl_status.txt") + - self::CRAWL_TIME_OUT < time() ) { - $this->sendStopCrawlMessage(); - } - $schedule_status_exists = - file_exists(CRAWL_DIR."/schedules/schedule_status.txt"); - if($schedule_status_exists && - filemtime(CRAWL_DIR."/schedules/schedule_status.txt") + - self::CRAWL_TIME_OUT < time() ) { - $this->sendStopCrawlMessage(); - } - if($schedule_status_exists) { - $schedule_status = - @unserialize(file_get_contents( - CRAWL_DIR."/schedules/schedule_status.txt")); - if(isset($schedule_status[self::TYPE]) && - $schedule_status[self::TYPE] == self::SCHEDULER) { - $data['SCHEDULER_PEAK_MEMORY'] = - isset($schedule_status[self::MEMORY_USAGE]) ? - $schedule_status[self::MEMORY_USAGE] : 0; - } - } - $crawl_status = - @unserialize(file_get_contents( - CRAWL_DIR."/schedules/crawl_status.txt")); - $data = (is_array($crawl_status)) ? - array_merge($data, $crawl_status) : $data; - - } - if(isset($data['VISITED_COUNT_HISTORY']) && - count($data['VISITED_COUNT_HISTORY']) > 1) { - $recent = array_shift($data['VISITED_COUNT_HISTORY']); - $data["MOST_RECENT_TIMESTAMP"] = $recent[0]; - $oldest = array_pop($data['VISITED_COUNT_HISTORY']); - $change_in_time_hours = floatval(time() - $oldest[0])/3600.; - $change_in_urls = $recent[1] - $oldest[1]; - $data['VISITED_URLS_COUNT_PER_HOUR'] = ($change_in_time_hours > 0) ? - $change_in_urls/$change_in_time_hours : 0; - } else { - $data['VISITED_URLS_COUNT_PER_HOUR'] = 0; + $machine_urls = $this->machineModel->getQueueServerUrls(); + list($stalled, $status, $data['RECENT_CRAWLS']) = + $this->crawlModel->combinedCrawlInfo($machine_urls); + + if($stalled) { + $this->crawlModel->sendStopCrawlMessage($machine_urls); } - $data['RECENT_CRAWLS'] = $this->crawlModel->getCrawlList(false, true); - if(isset($data['CRAWL_TIME'])) { + + $data = array_merge($data, $status); + + $data["CRAWL_RUNNING"] = false; + if(isset($data['CRAWL_TIME']) && $data["CRAWL_TIME"] != 0) { //erase from previous crawl list any active crawl $num_crawls = count($data['RECENT_CRAWLS']); for($i = 0; $i < $num_crawls; $i++) { @@ -314,25 +278,16 @@ class AdminController extends Controller implements CrawlConstants $data['RECENT_CRAWLS'][$i] = false; } } + $data["CRAWL_RUNNING"] = true; $data['RECENT_CRAWLS']= array_filter($data['RECENT_CRAWLS']); } + rorderCallback($data['RECENT_CRAWLS'][0], $data['RECENT_CRAWLS'][0], + 'CRAWL_TIME'); + usort($data['RECENT_CRAWLS'], "rorderCallback"); return $data; } - /** - * Used to send a message to the queue_server to stop a crawl - */ - function sendStopCrawlMessage() - { - $info = array(); - $info[self::STATUS] = "STOP_CRAWL"; - $info_string = serialize($info); - file_put_contents( - CRAWL_DIR."/schedules/queue_server_messages.txt", - $info_string); - } - /** * Gets data from the machineModel concerning the on/off states * of the machines managed by this Yioop instance and then passes @@ -762,51 +717,59 @@ class AdminController extends Controller implements CrawlConstants if(isset($_REQUEST['arg']) && in_array($_REQUEST['arg'], $possible_arguments)) { + + $machine_urls = $this->machineModel->getQueueServerUrls(); + $num_machines = count($machine_urls); + if($num_machines < 1 || ($num_machines == 1 && + UrlParser::isLocalhostUrl($machine_urls[0]))) { + $machine_urls = NULL; + } + switch($_REQUEST['arg']) { case "start": $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". tl('admin_controller_starting_new_crawl')."</h1>')"; - $info = array(); - $info[self::STATUS] = "NEW_CRAWL"; - $info[self::CRAWL_TIME] = time(); + $crawl_params = array(); + $crawl_params[self::STATUS] = "NEW_CRAWL"; + $crawl_params[self::CRAWL_TIME] = time(); $seed_info = $this->crawlModel->getSeedInfo(); - $info[self::CRAWL_TYPE] = + $crawl_params[self::CRAWL_TYPE] = $seed_info['general']['crawl_type']; - $info[self::CRAWL_INDEX] = + $crawl_params[self::CRAWL_INDEX] = (isset($seed_info['general']['crawl_index'])) ? $seed_info['general']['crawl_index'] : ''; - $info[self::PAGE_RANGE_REQUEST] = + $crawl_params[self::PAGE_RANGE_REQUEST] = (isset($seed_info['general']['page_range_request'])) ? intval($seed_info['general']['page_range_request']) : PAGE_RANGE_REQUEST; - $info[self::PAGE_RECRAWL_FREQUENCY] = + $crawl_params[self::PAGE_RECRAWL_FREQUENCY] = (isset($seed_info['general']['page_recrawl_frequency'])) ? intval($seed_info['general']['page_recrawl_frequency']): PAGE_RECRAWL_FREQUENCY; - $info[self::TO_CRAWL] = + $crawl_params[self::TO_CRAWL] = $seed_info['seed_sites']['url']; - $info[self::CRAWL_ORDER] = + $crawl_params[self::CRAWL_ORDER] = $seed_info['general']['crawl_order']; - $info[self::RESTRICT_SITES_BY_URL] = + $crawl_params[self::RESTRICT_SITES_BY_URL] = $seed_info['general']['restrict_sites_by_url']; - $info[self::ALLOWED_SITES] = + $crawl_params[self::ALLOWED_SITES] = isset($seed_info['allowed_sites']['url']) ? $seed_info['allowed_sites']['url'] : array(); - $info[self::DISALLOWED_SITES] = + $crawl_params[self::DISALLOWED_SITES] = isset($seed_info['disallowed_sites']['url']) ? $seed_info['disallowed_sites']['url'] : array(); - $info[self::META_WORDS] = + $crawl_params[self::META_WORDS] = $seed_info['meta_words']; if(isset($seed_info['indexing_plugins']['plugins'])) { - $info[self::INDEXING_PLUGINS] = + $crawl_params[self::INDEXING_PLUGINS] = $seed_info['indexing_plugins']['plugins']; } if(isset($seed_info['indexed_file_types']['extensions'])) { - $info[self::INDEXED_FILE_TYPES] = + $crawl_params[self::INDEXED_FILE_TYPES] = $seed_info['indexed_file_types']['extensions']; } if(isset($_REQUEST['description'])) { @@ -815,49 +778,32 @@ class AdminController extends Controller implements CrawlConstants } else { $description = tl('admin_controller_no_description'); } - $info['DESCRIPTION'] = $description; - - $info_string = serialize($info); - file_put_contents( - CRAWL_DIR."/schedules/queue_server_messages.txt", - $info_string); - chmod(CRAWL_DIR."/schedules/queue_server_messages.txt", - 0777); - $scheduler_info[self::HASH_SEEN_URLS] = array(); - - foreach ($seed_info['seed_sites']['url'] as $site) { - $scheduler_info[self::TO_CRAWL][] = array($site, 1.0); - } - $scheduler_string = "\n".webencode( - gzcompress(serialize($scheduler_info))); - file_put_contents( - CRAWL_DIR."/schedules/".self::schedule_start_name, - $scheduler_string); + $crawl_params['DESCRIPTION'] = $description; + + $this->crawlModel->sendStartCrawlMessage($crawl_params, + $seed_info, $machine_urls); break; case "stop": $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". tl('admin_controller_stop_crawl')."</h1>')"; - $this->sendStopCrawlMessage(); + $this->crawlModel->sendStopCrawlMessage($machine_urls); break; case "resume": $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". tl('admin_controller_resume_crawl')."</h1>')"; - $seed_info = $this->crawlModel->getSeedInfo(); - $info = array(); - $info[self::STATUS] = "RESUME_CRAWL"; - $info[self::CRAWL_TIME] = + $crawl_params = array(); + $crawl_params[self::STATUS] = "RESUME_CRAWL"; + $crawl_params[self::CRAWL_TIME] = $this->clean($_REQUEST['timestamp'], "int"); /* 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", - $info_string); + $this->crawlModel->sendStartCrawlMessage($crawl_params, + NULL, $machine_urls); break; @@ -865,7 +811,8 @@ class AdminController extends Controller implements CrawlConstants if(isset($_REQUEST['timestamp'])) { $timestamp = $this->clean($_REQUEST['timestamp'], "int"); - $this->crawlModel->deleteCrawl($timestamp); + $this->crawlModel->deleteCrawl($timestamp, + $machine_urls); $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". tl('admin_controller_delete_crawl_success'). @@ -891,7 +838,8 @@ class AdminController extends Controller implements CrawlConstants (getLocaleDirection() == 'ltr') ? "right": "left"; $data["ELEMENT"] = "crawloptionsElement"; $crawls = $this->crawlModel->getCrawlList(); - $indexes = $this->crawlModel->getCrawlList(true, true); + $indexes = $this->crawlModel->getCrawlList(true, true, + $machine_urls); $update_flag = false; $data['available_options'] = array( tl('admin_controller_use_below'), @@ -990,7 +938,7 @@ class AdminController extends Controller implements CrawlConstants $update_flag = true; } $data['crawl_order'] = $seed_info['general']['crawl_order']; - + if(!$no_further_changes && isset($_REQUEST['posted'])) { $seed_info['general']['restrict_sites_by_url'] = (isset($_REQUEST['restrict_sites_by_url'])) ? @@ -1076,44 +1024,14 @@ class AdminController extends Controller implements CrawlConstants $add_message = ""; if(isset($_REQUEST['ts']) && isset($_REQUEST['inject_sites'])) { - $dir = CRAWL_DIR."/schedules/". - self::schedule_data_base_name. $timestamp; - if(!file_exists($dir)) { - mkdir($dir); - chmod($dir, 0777); - } - $day = floor($timestamp/86400) - 1; - //want before all other schedules, - // execute next - $dir .= "/$day"; - if(!file_exists($dir)) { - mkdir($dir); - chmod($dir, 0777); - } - $inject_urls = - $this->convertStringCleanUrlsArray( + $inject_urls = + $this->convertStringCleanUrlsArray( $_REQUEST['inject_sites']); - $count = count($inject_urls); - if($count > 0 ) { - $now = time(); - $schedule_data = array(); - $schedule_data[self::SCHEDULE_TIME] = - $timestamp; - $schedule_data[self::TO_CRAWL] = array(); - for($i = 0; $i < $count; $i++) { - $url = $inject_urls[$i]; - $hash = crawlHash($now.$url); - $schedule_data[self::TO_CRAWL][] = - array($url, 1, $hash); + if($this->crawlModel->injectUrlsCurrentCrawl( + $inject_urls, $machine_urls)) { + $add_message = "<br />". + tl('admin_controller_urls_injected'); } - $data_string = webencode( - gzcompress(serialize($schedule_data))); - $data_hash = crawlHash($data_string); - file_put_contents($dir."/At1From127-0-0-1". - "WithHash$data_hash.txt", $data_string); - $add_message = "<br />". - tl('admin_controller_urls_injected'); - } } if($update_flag) { if(isset($_REQUEST['ts'])) { @@ -1127,7 +1045,7 @@ class AdminController extends Controller implements CrawlConstants "$add_message</h1>');"; } break; - + default: } @@ -2160,7 +2078,7 @@ class AdminController extends Controller implements CrawlConstants } else { $clean_field = $_POST[$field]; } - if($field == "QUEUE_SERVER" && + if($field == "NAME_SERVER" && $clean_field[strlen($clean_field) -1] != "/") { $clean_field .= "/"; } diff --git a/controllers/crawl_controller.php b/controllers/crawl_controller.php new file mode 100644 index 000000000..ee2c187cd --- /dev/null +++ b/controllers/crawl_controller.php @@ -0,0 +1,183 @@ +<?php +/** + * SeekQuarry/Yioop -- + * Open Source Pure PHP Search Engine, Crawler, and Indexer + * + * Copyright (C) 2009 - 2012 Chris Pollett chris@pollett.org + * + * LICENSE: + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * END LICENSE + * + * @author Chris Pollett chris@pollett.org + * @package seek_quarry + * @subpackage controller + * @license http://www.gnu.org/licenses/ GPL3 + * @link http://www.seekquarry.com/ + * @copyright 2009 - 2012 + * @filesource + */ + +if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} + +/** Load base controller class if needed */ +require_once BASE_DIR."/controllers/controller.php"; + +/** Loads common constants for web crawling*/ +require_once BASE_DIR."/lib/crawl_constants.php"; + +/** Need getHost to partition urls to different queue_servers*/ +require_once BASE_DIR."/lib/url_parser.php"; + + +/** + * + * + * @author Chris Pollett + * @package seek_quarry + * @subpackage controller + */ +class CrawlController extends Controller implements CrawlConstants +{ + /** + * No models used by this controller + * @var array + */ + var $models = array("crawl"); + /** + * Only outputs JSON data so don't need view + * @var array + */ + var $views = array(); + /** + * These are the activities supported by this controller + * @var array + */ + var $activities = array("sendStartCrawlMessage", "sendStopCrawlMessage", + "crawlStalled", "crawlStatus", "deleteCrawl", "injectUrlsCurrentCrawl", + "getCrawlList", "combinedCrawlInfo", "getInfoTimestamp"); + + /** + * Number of characters from end of most recent log file to return + * on a log request + */ + const LOG_LISTING_LEN = 100000; + /** + * Checks that the request seems to be coming from a legitimate fetcher then + * determines which activity the fetcher is requesting and calls that + * activity for processing. + * + */ + function processRequest() + { + $data = array(); + + /* do a quick test to see if this is a request seems like + from a legitimate machine + */ + if(!$this->checkRequest()) {return; } + + $activity = $_REQUEST['a']; + if(in_array($activity, $this->activities)) {$this->$activity();} + } + + function crawlStalled() + { + echo webencode(serialize($this->crawlModel->crawlStalled())); + } + + function crawlStatus() + { + echo webencode(serialize($this->crawlModel->crawlStatus())); + } + + function getInfoTimestamp() + { + $timestamp = 0; + if(isset($_REQUEST["arg"]) ) { + $timestamp = unserialize(webdecode($_REQUEST["arg"])); + } + echo webencode(serialize($this->crawlModel->getInfoTimestamp( + $timestamp))); + } + + function getCrawlList() + { + $return_arc_bundles = false; + $return_recrawls = false; + if(isset($_REQUEST["arg"]) ) { + $arg = $this->clean($_REQUEST["arg"], "int"); + if($arg == 3 || $arg == 1) {$return_arc_bundles = true; } + if($arg == 3 || $arg == 2) {$return_recrawls = true; } + } + echo webencode(serialize($this->crawlModel->getCrawlList( + $return_arc_bundles, $return_recrawls))); + } + + function combinedCrawlInfo() + { + $combined = $this->crawlModel->combinedCrawlInfo(); + echo webencode(serialize($combined)); + } + + function deleteCrawl() + { + if(!isset($_REQUEST["arg"]) ) { + return; + } + $timestamp = unserialize(webdecode($_REQUEST["arg"])); + $this->crawlModel->deleteCrawl($timestamp); + } + + function injectUrlsCurrentCrawl() + { + if(!isset($_REQUEST["arg"]) || !isset($_REQUEST["num"]) + || !isset($_REQUEST["i"])) { + return; + } + $inject_urls = unserialize(webdecode($_REQUEST["arg"])); + $inject_urls = partitionByHash($inject_urls, + NULL, $num, $i, "ParseUrl::getHost"); + $this->crawlModel->injectUrlsCurrentCrawl($inject_urls, NULL); + } + + function sendStopCrawlMessage() + { + $this->crawlModel->sendStopCrawlMessage(); + } + + + function sendStartCrawlMessage() + { + + if(!isset($_REQUEST["arg"]) || !isset($_REQUEST["num"]) + || !isset($_REQUEST["i"])) { + return; + } + $num = $this->clean($_REQUEST["num"], "int"); + $i = $this->clean($_REQUEST["i"], "int"); + list($crawl_params, + $seed_info) = unserialize(webdecode($_REQUEST["arg"])); + $seed_info['seed_sites']['url'] = + partitionByHash($seed_info['seed_sites']['url'], + NULL, $num, $i, "UrlParser::getHost"); + $this->crawlModel->sendStartCrawlMessage($crawl_params, $seed_info, + NULL); + } + + +} +?> diff --git a/controllers/fetch_controller.php b/controllers/fetch_controller.php index 89b5d7e74..47f701195 100755 --- a/controllers/fetch_controller.php +++ b/controllers/fetch_controller.php @@ -54,7 +54,7 @@ class FetchController extends Controller implements CrawlConstants * No models used by this controller * @var array */ - var $models = array(); + var $models = array("machine"); /** * Load FetchView to return results to fetcher * @var array @@ -252,6 +252,10 @@ class FetchController extends Controller implements CrawlConstants $info[self::CRAWL_TIME] = 0; } + $info[self::QUEUE_SERVERS] = $this->machineModel->getQueueServerUrls(); + if($info[self::QUEUE_SERVERS] == array()) { + $info[self::QUEUE_SERVERS] = array(NAME_SERVER); + } $data = array(); $data['MESSAGE'] = serialize($info); diff --git a/controllers/search_controller.php b/controllers/search_controller.php index f971fc9b2..28c5c4ed9 100755 --- a/controllers/search_controller.php +++ b/controllers/search_controller.php @@ -60,7 +60,7 @@ class SearchController extends Controller implements CrawlConstants * is used for cached web page requests * @var array */ - var $models = array("phrase", "crawl", "searchfilters"); + var $models = array("phrase", "crawl", "searchfilters", "machine"); /** * Says which views to load for this controller. * The SearchView is used for displaying general search results as well @@ -91,11 +91,17 @@ class SearchController extends Controller implements CrawlConstants { $data = array(); $view = "search"; + $web_flag = true; $start_time = microtime(); if(isset($_REQUEST['f']) && $_REQUEST['f']=='rss' && RSS_ACCESS) { $view = "rss"; + $web_flag = false; + } else if(isset($_REQUEST['f']) && $_REQUEST['f']=='serial' && + RSS_ACCESS) { + $view = "serial"; + $web_flag = false; } else if (!WEB_ACCESS) { return; } @@ -105,7 +111,9 @@ class SearchController extends Controller implements CrawlConstants $raw = false; } - if(isset($_SESSION['MAX_PAGES_TO_SHOW']) ) { + if(isset($_REQUEST['num'])) { + $results_per_page = $this->clean($_REQUEST['num'], "int"); + } else if(isset($_SESSION['MAX_PAGES_TO_SHOW']) ) { $results_per_page = $_SESSION['MAX_PAGES_TO_SHOW']; } else { $results_per_page = NUM_RESULTS_PER_PAGE; @@ -148,26 +156,27 @@ class SearchController extends Controller implements CrawlConstants if($activity == "query" && $this->checkMirrorHandle()) {return; } + $machine_urls = $this->machineModel->getQueueServerUrls(); + $current_its = $this->crawlModel->getCurrentIndexDatabaseName(); if(isset($_REQUEST['its']) || isset($_SESSION['its'])) { $its = (isset($_REQUEST['its'])) ? $_REQUEST['its'] : $_SESSION['its']; $index_time_stamp = $this->clean($its, "int"); - if(!$this->phraseModel->indexExists($index_time_stamp) - && !$this->crawlModel->isCrawlMix($index_time_stamp)) { - $index_time_stamp = - $this->crawlModel->getCurrentIndexDatabaseName(); - //use the default crawl index - } } else { - $index_time_stamp = - $this->crawlModel->getCurrentIndexDatabaseName(); + $index_time_stamp = $current_its; //use the default crawl index } - $index_info = NULL; - if($this->phraseModel->indexExists($index_time_stamp) || - $this->crawlModel->isCrawlMix($index_time_stamp)) { - $index_info = - $this->crawlModel->getInfoTimestamp($index_time_stamp); + if($web_flag) { + $index_info = $this->crawlModel->getInfoTimestamp( + $index_time_stamp, $machine_urls); + if($index_info == array() || $index_info["COUNT"] == 0) { + if($index_time_stamp != $current_its) { + $index_time_stamp = $current_its; + $index_info = $this->crawlModel->getInfoTimestamp( + $index_time_stamp, $machine_urls); + if($index_info == array()) { $index_info = NULL; } + } + } } if(isset($_REQUEST['q']) && strlen($_REQUEST['q']) > 0 || $activity != "query") { @@ -206,7 +215,7 @@ class SearchController extends Controller implements CrawlConstants } $data['its'] = (isset($index_time_stamp)) ? $index_time_stamp : 0; - if($index_info !== NULL) { + if($web_flag && $index_info !== NULL) { if(isset($index_info['IS_MIX'])) { $data['INDEX_INFO'] = tl('search_controller_mix_info', $index_info['DESCRIPTION']); @@ -223,7 +232,11 @@ class SearchController extends Controller implements CrawlConstants $data['YIOOP_TOKEN'] = $this->generateCSRFToken($user); $data['ELAPSED_TIME'] = changeInMicrotime($start_time); - $this->displayView($view, $data); + if ($view != "serial") { + $this->displayView($view, $data); + } else { + echo webencode(serialize($data)); + } } /** @@ -323,6 +336,12 @@ class SearchController extends Controller implements CrawlConstants $query = preg_replace('/no:cache/', "", $query); $use_cache_if_possible = ($original_query == $query) ? true : false; + if(!isset($_REQUEST['network']) || $_REQUEST['network'] == "true") { + $queue_servers = $this->machineModel->getQueueServerUrls(); + } else { + + $queue_servers = array(); + } switch($activity) { @@ -341,7 +360,7 @@ class SearchController extends Controller implements CrawlConstants $top_query = implode(" ", $top_phrases); $phrase_results = $this->phraseModel->getPhrasePageResults( $top_query, $limit, $results_per_page, false, NULL, - $use_cache_if_possible, $raw); + $use_cache_if_possible, $raw, $queue_servers); $data['PAGING_QUERY'] = "index.php?c=search&a=related&arg=". urlencode($url); @@ -379,7 +398,7 @@ class SearchController extends Controller implements CrawlConstants $filter = $this->searchfiltersModel->getFilter(); $phrase_results = $this->phraseModel->getPhrasePageResults( $query, $limit, $results_per_page, true, $filter, - $use_cache_if_possible, $raw); + $use_cache_if_possible, $raw, $queue_servers); $query = $original_query; } $data['PAGING_QUERY'] = "index.php?q=".urlencode($query); diff --git a/controllers/settings_controller.php b/controllers/settings_controller.php index c1f2ba642..e23540e55 100755 --- a/controllers/settings_controller.php +++ b/controllers/settings_controller.php @@ -59,7 +59,7 @@ class SettingsController extends Controller * is used to get a list of available crawls * @var array */ - var $models = array("locale", "crawl", "user"); + var $models = array("locale", "crawl", "user", "machine"); /** * Sets up the available perpage language options. @@ -111,7 +111,10 @@ class SettingsController extends Controller $data['PER_PAGE_SELECTED'] = NUM_RESULTS_PER_PAGE; } - $crawls = $this->crawlModel->getCrawlList(false, true); + $machine_urls = $this->machineModel->getQueueServerUrls(); + + $crawls = $this->crawlModel->getCrawlList(false, true, $machine_urls, + true); $data['CRAWLS'] = array(); foreach($crawls as $crawl) { $data['CRAWLS'][$crawl['CRAWL_TIME']] = $crawl['DESCRIPTION']. diff --git a/index.php b/index.php index e2250411c..589d1d687 100755 --- a/index.php +++ b/index.php @@ -96,11 +96,11 @@ if ( false === function_exists('lcfirst') ) { { return (string)(strtolower(substr($str,0,1)).substr($str,1));} } -$available_controllers = array("search", "fetch", "cache", - "settings", "admin", "archive", "machine", "resource"); +$available_controllers = array( "admin", "archive", "cache", "crawl", + "fetch", "machine", "resource", "search", "settings"); if(!WEB_ACCESS) { -$available_controllers = array("fetch", "cache", - "admin", "archive", "machine"); +$available_controllers = array("admin", "archive", "cache", "crawl", "fetch", + "machine"); } //the request variable c is used to determine the controller diff --git a/lib/crawl_constants.php b/lib/crawl_constants.php index 6df01899b..7eae5f536 100644 --- a/lib/crawl_constants.php +++ b/lib/crawl_constants.php @@ -186,6 +186,8 @@ interface CrawlConstants const PAGE_RANGE_REQUEST = 'br'; const PAGE_RECRAWL_FREQUENCY = 'bs'; const DATA = 'bt'; + const QUEUE_SERVERS = "bu"; + const CURRENT_SERVER = "bv"; const NEEDS_OFFSET_FLAG = 0x7FFFFFFF; diff --git a/lib/fetch_url.php b/lib/fetch_url.php index 6cd8f671c..1a5113ad2 100755 --- a/lib/fetch_url.php +++ b/lib/fetch_url.php @@ -56,17 +56,20 @@ class FetchUrl implements CrawlConstants * @param array $sites an array containing urls of pages to request * @param bool $timer flag, true means print timing statistics to log * @param int $page_range_request maximum number of bytes to download/page + * 0 means download all * @param string $key the component of $sites[$i] that has the value of * a url to get defaults to URL * @param string $value component of $sites[$i] in which to store the * page that was gotten - * + * @param array $post_data for each site data to be POST'd to that site + * * @return array an updated array with the contents of those pages */ public static function getPages($sites, $timer = false, $page_range_request = PAGE_RANGE_REQUEST, $temp_dir = NULL, - $key=CrawlConstants::URL, $value = CrawlConstants::PAGE) + $key=CrawlConstants::URL, $value = CrawlConstants::PAGE, $minimal=false, + $post_data = NULL) { $agent_handler = curl_multi_init(); @@ -97,7 +100,9 @@ class FetchUrl implements CrawlConstants curl_setopt($sites[$i][0], CURLOPT_RETURNTRANSFER, true); curl_setopt($sites[$i][0], CURLOPT_CONNECTTIMEOUT,PAGE_TIMEOUT); curl_setopt($sites[$i][0], CURLOPT_TIMEOUT, PAGE_TIMEOUT); - curl_setopt($sites[$i][0], CURLOPT_HEADER, true); + if(!$minimal) { + curl_setopt($sites[$i][0], CURLOPT_HEADER, true); + } curl_setopt($sites[$i][0], CURLOPT_ENCODING, ""); //make lighttpd happier curl_setopt($sites[$i][0], CURLOPT_HTTPHEADER, @@ -107,9 +112,15 @@ class FetchUrl implements CrawlConstants curl_setopt($sites[$i][0], CURLOPT_RANGE, "0-". $page_range_request); } + if($post_data != NULL) { + curl_setopt($sites[$i][0], CURLOPT_POST, true); + curl_setopt($sites[$i][0], CURLOPT_POSTFIELDS, + $post_data[$i]); + } curl_multi_add_handle($agent_handler, $sites[$i][0]); } } + if($timer) { crawlLog(" Init Get Pages ".(changeInMicrotime($start_time))); } @@ -134,6 +145,7 @@ class FetchUrl implements CrawlConstants } if($timer) { + crawlLog(" Page Request time ".(changeInMicrotime($start_time))); } $start_time = microtime(); @@ -152,10 +164,14 @@ class FetchUrl implements CrawlConstants we sent was ignored. So we manually truncate the data here */ - $content = substr($content, 0, $page_range_request); - if(isset($content)) { + if($page_range_request > 0) { + $content = substr($content, 0, $page_range_request); + } + if(isset($content) && !$minimal) { $site = self::parseHeaderPage($content, $value); $sites[$i] = array_merge($sites[$i], $site); + } else { + $sites[$i][$value] = $content; } $sites[$i][self::HTTP_CODE] = @@ -238,7 +254,7 @@ class FetchUrl implements CrawlConstants */ public static function parseHeaderPage(&$header_and_page, $value=CrawlConstants::PAGE) - { + { $new_offset = 0; // header will include all redirect headers $site = array(); diff --git a/lib/index_bundle_iterators/group_iterator.php b/lib/index_bundle_iterators/group_iterator.php index d25e3fc97..ed54ab04f 100644 --- a/lib/index_bundle_iterators/group_iterator.php +++ b/lib/index_bundle_iterators/group_iterator.php @@ -114,6 +114,14 @@ class GroupIterator extends IndexBundleIterator */ var $only_lookup; + /** + * When true, tells any parent iterator not to try to call getIndex, + * currentGenDocOffsetWithWord, or computeRelevance + * + * @var bool + */ + var $no_lookup; + /** * the minimum number of pages to group from a block; * this trumps $this->index_bundle_iterator->results_per_block @@ -130,6 +138,8 @@ class GroupIterator extends IndexBundleIterator * * @param object $index_bundle_iterator to use as a source of documents * to iterate over + * @param int $num_iterators + * @param bool $only_lookup */ function __construct($index_bundle_iterator, $num_iterators = 1, $only_lookup = false) @@ -146,6 +156,10 @@ class GroupIterator extends IndexBundleIterator $this->results_per_block /= ceil($num_iterators/2); } $this->only_lookup = $only_lookup; + $this->no_lookup = + (isset( $this->index_bundle_iterator->no_lookup)) ? + $this->index_bundle_iterator->no_lookup : false; + $this->reset(); } @@ -186,6 +200,7 @@ class GroupIterator extends IndexBundleIterator function findDocsWithWord() { // first get a block of documents on which grouping can be done + $pages = $this->getPagesToGroup(); $this->count_block_unfiltered = count($pages); @@ -195,9 +210,10 @@ class GroupIterator extends IndexBundleIterator $this->current_block_hashes = array(); $this->current_seen_hashes = array(); if($this->count_block_unfiltered > 0 ) { - if($this->only_lookup) { + if($this->only_lookup && !$this->no_lookup) { $pages = $this->insertUnseenDocs($pages); + $this->count_block = count($pages); } else { /* next we group like documents by url and remember @@ -219,8 +235,8 @@ class GroupIterator extends IndexBundleIterator } } $this->pages = $pages; - return $pages; + return $pages; } /** @@ -242,7 +258,7 @@ class GroupIterator extends IndexBundleIterator $pages = -1; } } else { - $pages = array_merge($pages, $new_pages); + $pages += $new_pages; $count = count($pages); } if($count < $this->results_per_block && !$done) { @@ -250,7 +266,7 @@ class GroupIterator extends IndexBundleIterator } else { $done = true; } - } while(!$done); + } while($done != true); return $pages; } @@ -317,7 +333,7 @@ class GroupIterator extends IndexBundleIterator foreach($pre_out_pages as $hash_url => $data) { $hash = $pre_out_pages[$hash_url][0][self::HASH]; $is_location = (crawlHash($hash_url. "LOCATION", true) == $hash); - if(!$data[0][self::IS_DOC] || $is_location) { + if(!$this->no_lookup && (!$data[0][self::IS_DOC] || $is_location)) { $item = $this->lookupDoc($data[0]['KEY'], $is_location, 3); if($item != false) { @@ -377,7 +393,7 @@ class GroupIterator extends IndexBundleIterator $count = count($word_iterator->dictionary_info); } if($count > 1) { - /* if a page is recrawlled it gets a second info page, + /* if a page is recrawled it gets a second info page, this is to ensure we look up the most recent */ $gen_off = array(); @@ -418,7 +434,7 @@ class GroupIterator extends IndexBundleIterator /** * This function is called if $raw mode 1 was requested. In this - * mode no grouping is done, but it a link does not correspond to + * mode no grouping is done, but if a link does not correspond to * a doc file already listed, then an attempt to look up the doc is * done * @@ -576,7 +592,7 @@ class GroupIterator extends IndexBundleIterator { if($this->current_block_fresh == false) { $result = $this->currentDocsWithWord(); - if(!is_array($result)) { + if(!is_array($result) || $this->no_lookup) { return $result; } } @@ -605,8 +621,8 @@ class GroupIterator extends IndexBundleIterator $index = $this->getIndex($key); } $index->setCurrentShard($generation, true); - $page = $index->getPage($summary_offset); - if($page == array()) {continue;} + $page = @$index->getPage($summary_offset); + if(!$page || $page == array()) {continue;} $ellipsis_used = false; if(!isset($out_pages[$doc_key][self::SUMMARY])) { $out_pages[$doc_key][self::SUMMARY] = $page; diff --git a/lib/index_bundle_iterators/network_iterator.php b/lib/index_bundle_iterators/network_iterator.php new file mode 100644 index 000000000..a86d91af7 --- /dev/null +++ b/lib/index_bundle_iterators/network_iterator.php @@ -0,0 +1,274 @@ +<?php +/** + * SeekQuarry/Yioop -- + * Open Source Pure PHP Search Engine, Crawler, and Indexer + * + * Copyright (C) 2009 - 2012 Chris Pollett chris@pollett.org + * + * LICENSE: + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * END LICENSE + * + * @author Chris Pollett chris@pollett.org + * @package seek_quarry + * @subpackage iterator + * @license http://www.gnu.org/licenses/ GPL3 + * @link http://www.seekquarry.com/ + * @copyright 2009 - 2012 + * @filesource + */ + +if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} + +/** + *Loads base class for iterating + */ +require_once BASE_DIR.'/lib/index_bundle_iterators/index_bundle_iterator.php'; + +/** + * Needed to be able to get pages from remote queue_servers + */ +require_once BASE_DIR.'/lib/fetch_url.php'; + + +/** + * This iterator is used to handle querying a network of queue_servers + * with regard to a query + * + * @author Chris Pollett + * @package seek_quarry + * @subpackage iterator + */ +class NetworkIterator extends IndexBundleIterator +{ + + /** + * Part of query without limit and num to be processed by all queue_server + * machines + * + * @var string + */ + var $base_query; + + /** + * When true, tells any parent iterator not to try to call getIndex, + * currentGenDocOffsetWithWord, or computeRelevance + * + * @var bool + */ + var $no_lookup; + + /** + * Current limit number to be added to base query + * + * @var string + */ + var $limit; + + /** + * An array of servers to ask a query to + * + * @var string + */ + var $queue_servers; + + /** + * Flags for each server saying if there are more results for that server + * or not + * + * @var array + */ + var $more_results; + + /** + * the minimum number of pages to group from a block; + * this trumps $this->index_bundle_iterator->results_per_block + */ + const MIN_FIND_RESULTS_PER_BLOCK = 200; + + /** + * Creates a network iterator with the given parameters. + * + * @param string $query + * @param array $queue_servers + * @param string $timestamp + */ + function __construct($query, $queue_servers, $timestamp) + { + $this->no_lookup = true; + $this->results_per_block = self::MIN_FIND_RESULTS_PER_BLOCK; + $this->base_query = "q=".urlencode($query). + "&f=serial&network=&raw=1&its=$timestamp"; + $this->queue_servers = $queue_servers; + $this->limit = 0; + $count = count($this->queue_servers); + for($i = 0; $i < $count; $i++) { + $this->more_flags[$i] = true; + } + } + + /** + * Computes a relevancy score for a posting offset with respect to this + * iterator and generation As this is not easily determined + * for a network iterator, this method always returns 1 for this + * iterator + * + * @param int $generation the generation the posting offset is for + * @param int $posting_offset an offset into word_docs to compute the + * relevance of + * @return float a relevancy score based on BM25F. + */ + function computeRelevance($generation, $posting_offset) + { + return 1; + } + + /** + * Returns the iterators to the first document block that it could iterate + * over + */ + function reset() + { + $this->limit = 0; + $count = count($this->queue_servers); + for($i = 0; $i < $count; $i++) { + $this->more_flags[$i] = true; + } + } + + /** + * Forwards the iterator one group of docs + * @param array $gen_doc_offset a generation, doc_offset pair. If set, + * the must be of greater than or equal generation, and if equal the + * next block must all have $doc_offsets larger than or equal to + * this value + */ + function advance($gen_doc_offset = null) + { + $this->advanceSeenDocs(); + $this->limit += $this->results_per_block; + } + + /** + * Returns the index associated with this iterator. As this is not easily + * determined for a network iterator, this method always returns NULL for + * this iterator + * @return object the index + */ + function getIndex($key = NULL) + { + return NULL; + } + + /** + * Gets the doc_offset and generation for the next document that + * would be return by this iterator. As this is not easily determined + * for a network iterator, this method always returns -1 for this + * iterator + * + * @return mixed an array with the desired document offset + * and generation; -1 on fail + */ + function currentGenDocOffsetWithWord() + { + return -1; + } + + /** + * Hook function used by currentDocsWithWord to return the current block + * of docs if it is not cached + * + * @return mixed doc ids and score if there are docs left, -1 otherwise + */ + function findDocsWithWord() + { + $query = $this->base_query . + "&num={$this->results_per_block}&limit={$this->limit}"; + + $sites = array(); + $lookup = array(); + $i = 0; + $j = 0; + foreach($this->queue_servers as $server) { + if($this->more_flags[$i]) { + $sites[$j][CrawlConstants::URL] = $server ."?". $query; + $lookup[$j] = $i; + $j++; + } + $i++; + } + + $downloads = array(); + if(count($sites) > 0) { + $downloads = FetchUrl::getPages($sites, false, 0, NULL, self::URL, + self::PAGE, true); + } + $results = array(); + $count = count($downloads); + $this->num_docs = 0; + for($j = 0 ; $j < $count; $j++) { + $download = & $downloads[$j]; + if(isset($download[self::PAGE])) { + $pre_result = @unserialize(webdecode($download[self::PAGE])); + if(!isset($pre_result["TOTAL_ROWS"]) || + $pre_result["TOTAL_ROWS"] < $this->results_per_block) { + $this->more_flags[$lookup[$j]] = false; + } + if(isset($pre_result["TOTAL_ROWS"])) { + $this->num_docs += $pre_result["TOTAL_ROWS"]; + } + if(isset($pre_result["PAGES"])) { + foreach($pre_result["PAGES"] as $page_data) { + if(isset($page_data["KEY"])) { + $results[$page_data["KEY"]] = + $page_data; + } + } + } + } + } + if($results == array()) { + $results = -1; + } + $this->count_block = count($results); + $this->pages = $results; + + return $results; + } + + /** + * Gets the summaries associated with the keys provided the keys + * can be found in the current block of docs returned by this iterator + * @param array $keys keys to try to find in the current block of returned + * results + * @return array doc summaries that match provided keys + */ + function getSummariesFromCurrentDocs($keys = NULL) + { + if($this->current_block_fresh == false) { + $pages = $this->currentDocsWithWord(); + if(!is_array($pages)) { + return $pages; + } + } else { + $pages = & $this->pages; + } + + return $pages; + } + +} + ?> diff --git a/lib/index_bundle_iterators/word_iterator.php b/lib/index_bundle_iterators/word_iterator.php index 7e423367c..d1fff9a29 100644 --- a/lib/index_bundle_iterators/word_iterator.php +++ b/lib/index_bundle_iterators/word_iterator.php @@ -260,8 +260,9 @@ class WordIterator extends IndexBundleIterator } } } - $this->count_block = count($results); + $this->pages = $results; + return $results; } diff --git a/lib/url_parser.php b/lib/url_parser.php index d137dbddc..29526b8da 100755 --- a/lib/url_parser.php +++ b/lib/url_parser.php @@ -422,6 +422,12 @@ class UrlParser if(!self::isSchemeHttpOrHttps($link)) {return NULL;} + if(isset($link[0]) && + $link[0] == "/" && isset($link[1]) && $link[1] == "/") { + $http = ($site[4] == 's') ? "https:" : "http:"; + $link = $http . $link; + } + if(self::hasHostUrl($link)) { $host = self::getHost($link); $path = self::getPath($link); @@ -540,6 +546,30 @@ class UrlParser } + /** + * Checks if a $url is on localhost + * + * @param string $url the url to check + * @return bool whether or not it is on localhost + */ + static function isLocalhostUrl($url) + { + $host = UrlParser::getHost($url, false); + + $localhosts = array("localhost", "127.0.0.1", "::1"); + if(isset($_SERVER["SERVER_NAME"])) { + $localhosts[] = $_SERVER["SERVER_NAME"]; + } + if(isset($_SERVER["SERVER_ADDR"])) { + $localhosts[] = $_SERVER["SERVER_ADDR"]; + } + foreach($localhosts as $localhost) { + if(stristr($host, $localhost)) { + return true; + } + } + return false; + } } diff --git a/lib/utility.php b/lib/utility.php index c896b3062..5e1826fa7 100755 --- a/lib/utility.php +++ b/lib/utility.php @@ -528,8 +528,44 @@ function crawlCrypt($string, $salt = NULL) return crawlHash($string.$salt).$salt; } +/** + * + */ +function partitionByHash($table, $field, $num_partition, $instance, + $callback = NULL) +{ + $out_table = array(); + foreach($table as $row) { + $cell = ($field === NULL) ? $row : $row[$field]; + $hash_int = calculatePartition($cell, $num_partition, $callback); + if($hash_int == $instance) { + $out_table[] = $row; + } + } + return $out_table; +} +/** + * + */ +function calculatePartition($input, $num_partition, $callback = NULL) +{ + if($callback !== NULL) { + $callback_parts = explode("::", $callback); + if(count($callback_parts) == 1) { + $input = $callback($input); + } else { + $class_name = $callback_parts[0]; + $method_name = $callback_parts[1]; + $input = $class_name::$method_name($input); + } + } + $hash_int = abs(unpackInt(substr(crawlHash($input, true), 0, 4))) % + $num_partition; + + return $hash_int; +} /** * Measures the change in time in seconds between two timestamps to microsecond @@ -539,7 +575,7 @@ function crawlCrypt($string, $salt = NULL) * @param string $end ending time with microseconds, if null use current time * @return float time difference in seconds */ -function changeInMicrotime( $start, $end=NULL ) +function changeInMicrotime( $start, $end = NULL) { if( !$end ) { $end= microtime(); @@ -673,6 +709,27 @@ function orderCallback($word_doc_a, $word_doc_b, $order_field = NULL) (float)$word_doc_b[$field]) ? -1 : 1; } +/** + * Callback function used to sort documents by a field in reverse order + * + * Should be initialized before using in usort with a call + * like: orderCallback($tmp, $tmp, "field_want"); + * + * @param string $word_doc_a doc id of first document to compare + * @param string $word_doc_b doc id of second document to compare + * @param string $field which field of these associative arrays to sort by + * @return int -1 if first doc bigger 1 otherwise + */ +function rorderCallback($word_doc_a, $word_doc_b, $order_field = NULL) +{ + static $field = "a"; + if($order_field !== NULL) { + $field = $order_field; + } + return ((float)$word_doc_a[$field] > + (float)$word_doc_b[$field]) ? 1 : -1; +} + /** * Callback to check if $a is less than $b * diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 235adabbd..ed7bfdbfd 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/de/configure.ini b/locale/de/configure.ini index 1296e59bb..acffda742 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 5e2c496f8..ee1d85be8 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "Username or Password Incorrect!" ; admin_controller.php line: 138 admin_controller_login_to_config = "Login to continue configuration (default: u=root, p=)" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "Typed passwords do not match." ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "Current password incorrect." ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "Password change successful!!" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "Select Username" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "Select Role" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "Typed passwords do not match." ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "Cannot Create User As Username Exists" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "User Created" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "Username Does Not Exist" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "User Deleted" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "Username Does Not Exist" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "Role Name Added" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "Username Does Not Exist" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "Role Name Deleted" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "Select Role" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "Select Activity" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "Role Name Exists" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "Role Name Added" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "Role Name Deleted" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "Activity Name Does not Exist" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "Activity Added" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "Role Name Does not Exist" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "Activity Name Does not Exist" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "Activity Deleted" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "Starting New Crawl!" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "No Description for Crawl" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "Stopping crawl. . .This will take a moment to refresh." ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "Resuming crawl. . .This will take a moment to refresh." ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "Deleting Crawl. . .This will take a moment to refresh." ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "Delete Crawl Failed!!" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "Setting Crawl To Use as Index" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "Use options below" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "Use Yioop! defaults" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "Use options below" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "Previous Crawl:" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "Breadth First" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "Page Importance" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "Urls Injected!" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "Updating Seed Site Info!" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "Select Crawl" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "Select Crawl" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "Unnamed Crawl" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "Crawl Mix Created!" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "Setting Crawl To Use as Index" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "Mix to Delete Does not Exist!" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "Crawl Mix Deleted!" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "Add Crawls" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "Number of Results" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "Delete Group" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "Weight" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "Name" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "Keywords" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "Actions" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "Add Query" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "Delete" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "Crawl Mix Changes Saved!" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "Never" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "1 days" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "2 days" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "3 days" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "7 days" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "14 days" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "Filtered Sites Updated!" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "Select Machine" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "Machine Added!" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "Machine Name Already Exists; Please Delete First!" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "Missing Fields From Machine Form!" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "Machine Name does not Exists!" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "Machine in use. Please stop the service running on it!" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "Machine Deleted!" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "No Log File Found." ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "Machine's Servers Updated!" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "Unable to Perform Action!" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "Select Locale" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "Locale Added!" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "Locale Does Not Exist!" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "Locale Deleted" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "Select a page" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "Static Page Updated!" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "Locale Strings Updated!" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "configs/config.php not web server writable." ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "Work directory needs to be writable by web server. " ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "pnp.ini file variable post_max_size should be at least 32M" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "The following required items were missing: %s" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "The following optional items were missing: %s" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "Check Passed." ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "Using configs/local_config.php so changing work directory above may not work." ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "Please Name Your robot" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "Unable to Update config.php File!" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "Unable to Create Profile!" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "Problem Updating Database!" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "Profile Updated!" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "Please Describe Your Robot" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "Logout Successful!!" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "Using Crawl Mix: %s" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "Using Index: %s -- Size: %s pages/%s urls" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "No Search Index Set For Use!" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "This cached version of %s was obtained by the Yioop crawler on %s." ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "Toggle Extracted Page Summaries" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "Inlinks" configure_element_ip_link = "IP address" ; ; configure_element.php line: 219 -configure_element_queue_server = "Queue Server Set-up" +configure_element_name_server = "Name Server Set-up" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "Server Key:" +configure_element_name_server_key = "Server Key:" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "Queue Server URL:" +configure_element_name_server_url = "Name Server URL:" ; ; configure_element.php line: 233 configure_element_use_memcache = "Use Memcache:" @@ -1038,34 +1038,37 @@ web_layout_description = "PHP Crawler and Search Engine Software" ; web_layout.php line: 95 web_layout_query_statistics = "Query Statistics" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "Total Elapsed Time for Queries: %s seconds." ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "Time: %s seconds." ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "No Monitored Machines" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "Mirrors" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "Log" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "Queue Server" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "Log" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "Machine has no queue server" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "Machine has no fetchers" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "Fetchers" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "Log" ; ; nocache_view.php line: 65 diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index b6bef56f0..5a165df53 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/locale/es/configure.ini b/locale/es/configure.ini index 966e5cb90..d644311f2 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 54409e4ad..2fc818826 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "Trouvez ce que vous cherchez" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index ef2618cef..0698fe37c 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "סיסמא / שם משתמש אינו נכון" ; admin_controller.php line: 138 admin_controller_login_to_config = "התחבר על מנת להמשך בתהליך" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "סיסמא אינה נכונה" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "סיסמא אינה נכונה" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "סיסמא עודכנה בהצלחה" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "בחר שם משתמש" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "בחר תפקיד" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "סיסמא אינה נכונה" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = " שם משתמש קיים במערכת" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "שם שמשתמש אינו קיים" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "שם משתמש נמחק" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "שם שמשתמש אינו קיים" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "שם תפקיד אינו קיים" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "שם תפקיד נוצר" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "שם שמשתמש אינו קיים" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "שם תפקיד אינו קיים" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "שם תפקיד נמחק" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "בחר תפקיד" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "בחר פעילות" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "שם תפקיד קיים במערכת" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "שם תפקיד נוצר" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "שם תפקיד אינו קיים" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "שם תפקיד נמחק" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "שם תפקיד אינו קיים" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "שם פעילות אינו קיים במערכת" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "שם תפקיד אינו קיים" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "שם פעילות אינו קיים במערכת" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "פעילות נמחקה" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "השתמש באפשרויות הבאות" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = " השתמש כבררת מחדל כמנוע חיפוש" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "השתמש באפשרויות הבאות" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "פרופייל עודכן" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "בעיה עם עדכון הפרופייל" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "התנתקות הצליחה" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index b60d1702c..16921f19a 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "लॉग इन असफल" ; admin_controller.php line: 138 admin_controller_login_to_config = "कॉन्फ़िगर करने के लिए लॉगिन करें" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "पासवर्ड एक समान नहीं" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "अमान्य पुराना पासवर्ड" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "उपयोगकर्ता नाम का चयन करें" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "भूमिका नाम का चयन करें" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "पासवर्ड एक समान नहीं" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "उपयोगकर्ता मौजूद है" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "भूमिका नाम का चयन करें" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "क्रॉल पुनः आरंभ करें" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "लॉग आउट सफल" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "क्रॉल जानकारी " ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "सारांश डेटा" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index 2800042d3..db0cf2c4a 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "Login tidak berhasil" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "Kata sandi tidak sesuai" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "Kata sandi yang lama salah" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "Ganti kata sandi" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "Pilih username" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "Pilih rolename" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "Kata sandi tidak sesuai" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "Username ditemukan" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "Username telah ditambah" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "Username tidak ditemukan" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "Username telah dihapus" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "Username tidak ditemukan" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "Rolename tidak ditemukan" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "Rolename telah ditambah" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "Username tidak ditemukan" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "Rolename tidak ditemukan" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "Rolename telah dihapus" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "Pilih rolename" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "Pilih name aktivitas" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "Rolename ditemukan" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "Rolename telah ditambah" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "Rolename tidak ditemukan" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "Rolename telah dihapus" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "Rolename tidak ditemukan" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "Nama aktivitas tidak ditemukan" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "Aktivitas telah ditambah" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "Rolename tidak ditemukan" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "Nama aktivitas tidak ditemukan" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "Aktivitas telah dihapus" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "Pilih name locale" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "Locale telah ditambah" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "Locale tidak ditemukan" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "Locale telah dihapus" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "Logout berhasil" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 8e865afaa..0a23b600e 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 6bf096f03..daf355395 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "無効なユーザー名またはパスワー ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "パスワードを違います" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "無効な古いパスワード" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "パスワードの編集できました" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "選択ユーザー名" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "選択役割名" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "パスワードを違います" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "ユーザー名が存在します" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "ユーザー名が追加しました" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "ユーザー名は存在しません" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "ユーザー名を削除しました" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "ユーザー名は存在しません" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "役割は存在しません" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "役割が追加しました" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "ユーザー名は存在しません" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "役割は存在しません" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "役割を削除しました" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "選択役割名" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "選択アクティビティ名" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "役割が存在します" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "役割が追加しました" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "役割は存在しません" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "役割を削除しました" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "役割は存在しません" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "アクティビティ名は存在しません" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "アクティビティが追加しました" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "役割は存在しません" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "アクティビティ名は存在しません" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "アクティビティを削除しました" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "新しい検索を始まります" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "検索の説明ありません" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "検索を停止する。ちょっと待ってください。" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "検索を再会する。ちょっと待ってください。" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "検索を削除する。ちょっと待ってください。" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "検索削除を失敗しました" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "指数のための検索設定する。" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "幅優先" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "ページの重要性" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "シッド情報の更新" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "指数のための検索設定する。" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "選択ローケル" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "ローケルが追加しました" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "ローケルは存在しません" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "ローケルを削除しました" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "ローケルストリングを編集しました" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "ボット名を入力してください。" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "config.phpファイルのできない。更新" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "プロフィールを作成できない。" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "ディータベースの更新ない" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "プロフィールの変更できました。" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "プロフィールの変更できない。" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "ロボットの説明してください。" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "ログアウト成功" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "％sのこのキャッシュされたバージョンは％sのウィオップから入手しました。" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "キューサーバ設定" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "キューサーバキー" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "キューサーバURL" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "ヘルプ 探している情報を見つける。" ; web_layout.php line: 95 web_layout_query_statistics = "キュエリの統計" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "経過時間の合計：%s分" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "キュエリ時間：%s分" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/ja/statistics.txt b/locale/ja/statistics.txt index c4f2a22ab..055203437 100755 --- a/locale/ja/statistics.txt +++ b/locale/ja/statistics.txt @@ -1 +1 @@ -d:52; \ No newline at end of file +d:51; \ No newline at end of file diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index f197d3b9e..b69e36158 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "ಒಳಪ್ರವೇಶಣೆ ವಿಫಲ, ; admin_controller.php line: 138 admin_controller_login_to_config = "ಸಂರಚನೆ ಮುಂದುವರೆಸಲು ಒಳಪ್ರವೇಶಿಸಿ" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "ಬರೆದ ಪ್ರವೇಶ ಪದಗಳು ಹೋಲಲಿಲ್ಲ " ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "ಪ್ರಸ್ತುತ ಪ್ರವೇಶ ಪದ ತಪ್ಪಾಗಿದೆ" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "ಪ್ರವೇಶ ಪದ ಬದಲಣೆ ಸಫಲವಾಯಿತು" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "ಬಳಕೆದಾರನ ಹೆಸರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "ಬಳಕೆದಾರನ ಪಾತ್ರ ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "ಬರೆದ ಪ್ರವೇಶ ಪದಗಳು ಹೋಲಲಿಲ್ಲ " ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇದೆ" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "ಬಳಕೆದಾರನ ಹೆಸರನ್ನು ಸೃಷ್ಟನೆ ಸಂಪೂರ್ಣವಾಯಿತು" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "ಬಳಕೆದಾರನ ಹೆಸರನ್ನು ಅಳಿಸಲಾಯಿತು" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಸೇರಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಅಳಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "ಬಳಕೆದಾರನ ಪಾತ್ರ ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "ಚಟುವಟಿಕೆ ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇದೆ" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಸೇರಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಅಳಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "ಈ ಚಟುವಟಿಕೆಯ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "ಈ ಚಟುವಟಿಕೆಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "ಈ ಚಟುವಟಿಕೆಯ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "ಈ ಚಟುವಟಿಕೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "ಹೊಸ ಕ್ರಾವ್ಲ್ ಪ್ರಾರಂಬಿಸುತಿದ್ದಿವಿ" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "ಕ್ರಾವ್ಲಿನ ವಿವರಣೆ ಇಲ್ಲ" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "ಕ್ರಾವ್ಲನ್ನು ನಿಲ್ಲಿಸುತಿದ್ದಿವಿ...ಈ ತೆರೆ ಸ್ವಲ್ಪ ಕ್ಷಣಗಳ ನಂತರ ಮಾರ್ಪಡುವುದು " ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "ಕ್ರಾವ್ಲನ್ನು ಮರುಚಾಲಿಸುತಿದ್ದಿ...ಈ ತೆರೆ ಸ್ವಲ್ಪ ಕ್ಷಣಗಳ ನಂತರ ಮಾರ್ಪಡುವುದು " ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "ಕ್ರಾವ್ಲನ್ನು ಅಳಿಸುತಿದ್ದಿವಿ...ಈ ತೆರೆ ಸ್ವಲ್ಪ ಕ್ಷಣಗಳ ನಂತರ ಮಾರ್ಪಡುವುದು" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "ಕ್ರಾವ್ಲನ್ನು ಅಳಿಸಲು ವಿಫಲವಾಗಿದೆ!! " ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "ಸೂಚಿಕೆಯಾಗಿ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "ಐಚ್ಛಿಕ ಆಯ್ಕೆ ಉಪಯೋಗಿಸಿ" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "ಯೂಪ್ ನ ಪೂರ್ವನಿಯೋಜಿತ ನಿಗದಿಗಳನ್ನು ಉಪಯೋಗಿಸಿ" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "ಐಚ್ಛಿಕ ಆಯ್ಕೆ ಉಪಯೋಗಿಸಿ" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "ಮೊದಲಿನ ಕ್ರಾವ್ಲ:" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "ಅಗಲ ಮೊದಲಾಗಿ" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "ಪುಟ ಪ್ರಾಮುಖ್ಯತೆ" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "ಮೂಲ ವೆಬ್ ಸೈಟಿನ ಮಾಹಿತಿಯನ್ನು ಪರಿಷ್ಕರಿಸಲಾಗುತ್ತಿದೆ" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "ಹೆಸರಿಡದ ಕ್ರಾವ್ಲ" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "ಕ್ರಾವ್ಲಗಳ ಮಿಶ್ರಣ ಸೃಜಿಸಲಾಯಿತು" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "ಸೂಚಿಕೆಯಾಗಿ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "ಅಳಿಸಬೇಕಾದ ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಳಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "ಕ್ರಾವ್ಲಗಳನ್ನು ಸೇರಿಸಿ" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "ಫಲಿತಾಂಶಗಳ ಸಂಖ್ಯೆ" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "ಗುಂಪನ್ನು ಅಳಿಸು" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "ಗೌರವ" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "ಹೆಸರು" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "ಮುಖ್ಯ ಪದ" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "ಕ್ರಿಯೆಗಳು" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "ಪ್ರಶ್ನೆಯನ್ನು ಸೇರಿಸು" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "ಅಳಿಸು" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "ಕ್ರಾವ್ಲ್ ಮಿಶ್ರಣದಲ್ಲಿ ಬದಲಾವಣೆಯನ್ನು ಉಳಿಸು" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "ಸೋಸಿದ ವೆಬ್ ಸೈಟಗಳನ್ನು ಪರಿಷ್ಕರಿಸಲಾಯಿತು" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಆಯ್ಕೆ ಮಾಡಿ" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಸೇರಿಸಲಾಗಿದೆ" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "ಈ ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "ಪ್ರದೇಶದ ಶಿಷ್ಟತೆ ಅಳಿಸಲಾಗಿದೆ " ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "ಪ್ರದೇಶ ಶಿಷ್ಟತೆಯ ಅಕ್ಷರ ಸಮೂಹವನ್ನು ಪರಿಷ್ಕರಿಸಲಾಯಿತು" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "configs/config.php ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಲ್ಲ" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆ ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಾಗಿರಬೇಕು" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "php.ini ಕಡಿತದ ಚರಾಂಶ post_max_size ಕನಿಷ್ಠ ಪಕ್ಷ ೧೬ ಎಂ.ಬಿ. ಇರಬೇಕು" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "ಬರುವ ಅವಶ್ಯಕವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "ಬರುವ ಕಡ್ಡಾಯವಲ್ಲದ ವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆಯಾಗಿದೆ" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು " ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ನಿಗದಿಪಡಿಸಲಾಗಿದೆ! ನೀವು ಮರು ಪ್ರವೇಶಿಸಬೇಕಾಗಬಹುದು" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "ಪಿಹೆಚಪಿ ಕ್ರಾವ್ಲರ್ ಮ ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "ಸಮಯ: %s ಸೆಕೆಂಡುಗಳು" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index a2da6e163..65cbc78fa 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "로그인 실패!!!" ; admin_controller.php line: 138 admin_controller_login_to_config = "관리 (default: u=root, p=)" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "비밀 번호가 일치하지 않습니다." ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "아이디나 비밀번호가 부정확 합니다." ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "비밀 번호를 성공적으로 변경하였습니다." ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "아이디를 선택하여 지정해 주십시요." ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "사용자 권한을 선택해 지정해 주십시요." ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "비밀 번호가 일치하지 않습니다." ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "동일 아이디가 존재하여 생성을 실패하였습니다." ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "아이디를 성공적으로 생성하였습니다." ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "아이디가 존재 하지 않습니다." ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "사용자를 삭제했습니다." ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "아이디가 존재 하지 않습니다." ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다." ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "사용자 권한 이름을 추가하였습니다." ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "아이디가 존재 하지 않습니다." ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다." ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "사용자 권한이름을 삭제하였습니다." ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "사용자 권한을 선택해 지정해 주십시요." ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "엑티비티 이름을 선택해 주십시요." ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "동일 권한 이름이 존재 합니다." ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "사용자 권한 이름을 추가하였습니다." ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다." ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "사용자 권한이름을 삭제하였습니다." ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다." ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "엑티비티 이름이 존재하지 않습니다." ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "엑티비티를 추가했습니다." ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다." ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "엑티비티 이름이 존재하지 않습니다." ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "엑티비티를 삭제 했습니다." ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "크롤 시작!!" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "크롤에 대한 설명이 존재 하지 않습니다." ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "크롤을 중지합니다. 잠시만 기다려 주십시요." ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "크롤을 다시 시작합니다. 잠시만 기다려 주십시요." ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "크롤을 삭제합니다. 잠시만 기다려 주십시요." ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "크롤 삭제 실패!!" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "크롤을 인덱스로써 사용하기 지정" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "너비 우선" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "페이지 중요성" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "씨드 사이트 업데이트" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "크롤을 인덱스로써 사용하기 지정" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "로케일을 선택하여 주십시요." ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "로케일 추가!!" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "로케일이 존재하지 않습니다." ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "로케일을 삭제 하였습니다." ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "로케일 지정 문자열을 업데이트 하였습니다." ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다." ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "로봇 이름을 정해 주십시요." ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다." ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "config.php 파일을 업데이트 실패했습니다." ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "데이터베이스를 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "프로필을 업데이트 했습니다." ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "당신의 로봇을 기술해 주십시요." ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "로그 아웃 성공!!" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "현재 캐시 버젼 %s 은 Yioop 크롤 %s 에 의하여 얻어 졌습니다. " ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "퀘리 서버 설정" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "서버 키: " +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "퀘리 서버 주소:" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "찾고자 하는걸 도와드립니다." ; web_layout.php line: 95 web_layout_query_statistics = "퀘리 분석" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "퀘리: %s 초." ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "시간: %s 초." ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/ko/statistics.txt b/locale/ko/statistics.txt index b76794965..9602e5a6f 100755 --- a/locale/ko/statistics.txt +++ b/locale/ko/statistics.txt @@ -1 +1 @@ -d:54; \ No newline at end of file +d:53; \ No newline at end of file diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 45ecdc20a..cbd9e83ba 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index b986ae613..2db753775 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index d06a103e7..b14b7add7 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 65479655b..7b7b4468f 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index e05af3aa5..b885eb6fa 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 4e3b21d84..797919e04 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "Tên đăng nhập họăc khẩu khô ; admin_controller.php line: 138 admin_controller_login_to_config = "đăng nhập để cấu hình" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "Những mật khẩu đã nhập không trùng nhau" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "Mật khẩu cũ bị sai" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "Thay đổi mật khẩu" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "Chọn tên sử dụng" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "Chọn chức vụ" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "Những mật khẩu đã nhập không trùng nhau" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "Tên sử dụng tồn tại" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "Tên sử dụng đã đựơc tạo" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "Tên sử dụng không tồn tại" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "Xóa tên sử dụng" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "Tên sử dụng không tồn tại" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "Chức vụ không tồn tại" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "Cộng thêm chức vụ " ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "Tên sử dụng không tồn tại" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "Chức vụ không tồn tại" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "Xóa chức vụ" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "Chọn chức vụ" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "Lựa chọn họat động" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "Chức vụ đã đựơc dùng" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "Cộng thêm chức vụ " ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "Chức vụ không tồn tại" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "Xóa chức vụ" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "Chức vụ không tồn tại" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "Tên hoạt động không tồn tại" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "Bổ sung tên hoạt động " ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "Chức vụ không tồn tại" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "Tên hoạt động không tồn tại" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "Xóa tên hoạt động" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "Bắt đầu sự bò mới" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "Không có sự mô tả nào" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "Ngừng thu thập dữ liệu" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "Tiếp tục thu thập dữ liệu" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "Xóa thu thập dữ liệu thành công" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "Xóa thu thập dữ liệu không thành công" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 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: 897 +; admin_controller.php line: 850 admin_controller_use_below = "Sử dụng dưới đây" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "Sử dụng mặc định" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "Sử dụng dưới đây" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "trước thu thập dữ liệu" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "Bề rộng đầu tiên" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "Trang quan trọng" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "Cập nhật thông tin trang web hạt giống" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "Chọn thu thập thông tin" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "Chọn thu thập thông tin" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "Vô danh" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "Tạo ra hỗn hợp " ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 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: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "Kết hợp này không tồn tại" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "Xóa kết hợp " ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "Cộng thêm thu thập" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "Số kết quả" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "Nhóm bị xóa " ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "Trọng lượng" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "Tên" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "Từ khóa " ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "Hành động" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "Cộng thêm truy vấn" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "Xóa" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "Kết hợp đã được lưu dữ" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "Cập nhật các trang web lọc" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "Chọn miền địa phương" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "Miền địa phương thêm vào" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "Miền địa phương không tồn tại" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "Xóa miền địa phương" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "Chuỗi Địa phương được cập nhật" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "Kiểm tra được thông qua" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 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: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "Đặt tên cho rô bô của bạn" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "Thư mục làm việc và hồ sơ được tạo ra" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "Không thể cập nhật hồ sơ config.php" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "Không thể tạo hồ sơ" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "Hồ sơ được cập nhật" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "Có sự trở ngaị về việc cập nhật hồ sơ " ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "Diễn tả rô bô của bạn" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "Thoát thành công" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "Bằng cách sử dụng kết hợp thu thập dữ liệu %s" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "Sử dụng chỉ số %s" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "Không có chỉ mục tìm kiếm thiết lập để sử dụng" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "Trang gốc này: %s đã tìm được bởi công cụ tìm kiẽm Yioop vào ngày %s." ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "Chuyển đổi chiết xuất trang tóm tắt" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "Giúp tìm caí mà bạn mu ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "Thời gian: %s giây" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index c68b0fbac..57f911d63 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -37,328 +37,328 @@ admin_controller_login_failed = "登入失敗" ; admin_controller.php line: 138 admin_controller_login_to_config = "" ; -; admin_controller.php line: 374 +; admin_controller.php line: 334 admin_controller_passwords_dont_match = "密碼錯誤" ; -; admin_controller.php line: 384 +; admin_controller.php line: 344 admin_controller_invalid_old_password = "密碼無效" ; -; admin_controller.php line: 391 +; admin_controller.php line: 351 admin_controller_change_password = "改變密碼" ; -; admin_controller.php line: 422 +; admin_controller.php line: 382 admin_controller_select_username = "使用者名稱" ; -; admin_controller.php line: 459 +; admin_controller.php line: 419 admin_controller_select_rolename = "暱稱" ; -; admin_controller.php line: 485 +; admin_controller.php line: 445 admin_controller_passwords_dont_match = "密碼錯誤" ; -; admin_controller.php line: 492 +; admin_controller.php line: 452 admin_controller_username_exists = "使用者已存在" ; -; admin_controller.php line: 499 +; admin_controller.php line: 459 admin_controller_username_added = "新增使用者" ; -; admin_controller.php line: 508 +; admin_controller.php line: 468 admin_controller_username_doesnt_exists = "此使用者不存在" ; -; admin_controller.php line: 515 +; admin_controller.php line: 475 admin_controller_username_deleted = "刪除使用者" ; -; admin_controller.php line: 522 +; admin_controller.php line: 482 admin_controller_username_doesnt_exists = "此使用者不存在" ; -; admin_controller.php line: 528 +; admin_controller.php line: 488 admin_controller_rolename_doesnt_exists = "無此暱稱" ; -; admin_controller.php line: 534 +; admin_controller.php line: 494 admin_controller_rolename_added = "增加暱稱" ; -; admin_controller.php line: 545 +; admin_controller.php line: 505 admin_controller_username_doesnt_exists = "此使用者不存在" ; -; admin_controller.php line: 551 +; admin_controller.php line: 511 admin_controller_rolename_doesnt_exists = "無此暱稱" ; -; admin_controller.php line: 561 +; admin_controller.php line: 521 admin_controller_rolename_deleted = "刪除暱稱" ; -; admin_controller.php line: 591 +; admin_controller.php line: 551 admin_controller_select_rolename = "暱稱" ; -; admin_controller.php line: 626 +; admin_controller.php line: 586 admin_controller_select_activityname = "" ; -; admin_controller.php line: 659 +; admin_controller.php line: 619 admin_controller_rolename_exists = "此暱稱已存在" ; -; admin_controller.php line: 669 +; admin_controller.php line: 629 admin_controller_rolename_added = "增加暱稱" ; -; admin_controller.php line: 680 +; admin_controller.php line: 640 admin_controller_rolename_doesnt_exists = "無此暱稱" ; -; admin_controller.php line: 688 +; admin_controller.php line: 648 admin_controller_rolename_deleted = "刪除暱稱" ; -; admin_controller.php line: 694 +; admin_controller.php line: 654 admin_controller_rolename_doesnt_exists = "無此暱稱" ; -; admin_controller.php line: 700 +; admin_controller.php line: 660 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 710 +; admin_controller.php line: 670 admin_controller_activity_added = "" ; -; admin_controller.php line: 716 +; admin_controller.php line: 676 admin_controller_rolename_doesnt_exists = "無此暱稱" ; -; admin_controller.php line: 723 +; admin_controller.php line: 683 admin_controller_activityname_doesnt_exists = "" ; -; admin_controller.php line: 735 +; admin_controller.php line: 695 admin_controller_activity_deleted = "" ; -; admin_controller.php line: 769 +; admin_controller.php line: 737 admin_controller_starting_new_crawl = "開始新的搜尋" ; -; admin_controller.php line: 816 +; admin_controller.php line: 784 admin_controller_no_description = "沒有任何項目" ; -; admin_controller.php line: 841 +; admin_controller.php line: 795 admin_controller_stop_crawl = "停止搜尋,需要一段時間更新" ; -; admin_controller.php line: 847 +; admin_controller.php line: 802 admin_controller_resume_crawl = "回復搜尋,需要一段時間更新" ; -; admin_controller.php line: 871 +; admin_controller.php line: 824 admin_controller_delete_crawl_success = "刪除搜尋,需要一段時間更新" ; -; admin_controller.php line: 876 +; admin_controller.php line: 829 admin_controller_delete_crawl_fail = "刪除搜尋失敗" ; -; admin_controller.php line: 883 +; admin_controller.php line: 836 admin_controller_set_index = "" ; -; admin_controller.php line: 897 +; admin_controller.php line: 850 admin_controller_use_below = "" ; -; admin_controller.php line: 898 +; admin_controller.php line: 851 admin_controller_use_defaults = "" ; -; admin_controller.php line: 900 +; admin_controller.php line: 853 admin_controller_use_below = "" ; -; admin_controller.php line: 903 +; admin_controller.php line: 856 admin_controller_previous_crawl = "" ; -; admin_controller.php line: 981 +; admin_controller.php line: 934 admin_controller_breadth_first = "深度優先" ; -; admin_controller.php line: 983 +; admin_controller.php line: 936 admin_controller_page_importance = "網頁重要性" ; -; admin_controller.php line: 1115 +; admin_controller.php line: 1038 admin_controller_urls_injected = "" ; -; admin_controller.php line: 1126 +; admin_controller.php line: 1049 admin_controller_update_seed_info = "" ; -; admin_controller.php line: 1201 +; admin_controller.php line: 1124 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1203 +; admin_controller.php line: 1126 admin_controller_select_crawl = "" ; -; admin_controller.php line: 1231 +; admin_controller.php line: 1154 admin_controller_unnamed = "" ; -; admin_controller.php line: 1236 +; admin_controller.php line: 1159 admin_controller_mix_created = "" ; -; admin_controller.php line: 1245 +; admin_controller.php line: 1168 admin_controller_set_index = "" ; -; admin_controller.php line: 1255 +; admin_controller.php line: 1178 admin_controller_mix_doesnt_exists = "" ; -; admin_controller.php line: 1263 +; admin_controller.php line: 1186 admin_controller_mix_deleted = "" ; -; admin_controller.php line: 1299 +; admin_controller.php line: 1222 editmix_element_add_crawls = "" ; -; admin_controller.php line: 1301 +; admin_controller.php line: 1224 editmix_element_num_results = "" ; -; admin_controller.php line: 1302 +; admin_controller.php line: 1225 editmix_element_del_grp = "" ; -; admin_controller.php line: 1303 +; admin_controller.php line: 1226 editmix_element_weight = "" ; -; admin_controller.php line: 1304 +; admin_controller.php line: 1227 editmix_element_name = "" ; -; admin_controller.php line: 1305 +; admin_controller.php line: 1228 editmix_add_keywords = "" ; -; admin_controller.php line: 1306 +; admin_controller.php line: 1229 editmix_element_actions = "" ; -; admin_controller.php line: 1307 +; admin_controller.php line: 1230 editmix_add_query = "" ; -; admin_controller.php line: 1308 +; admin_controller.php line: 1231 editmix_element_delete = "" ; -; admin_controller.php line: 1360 +; admin_controller.php line: 1283 admin_controller_mix_saved = "" ; -; admin_controller.php line: 1431 +; admin_controller.php line: 1354 admin_controller_recrawl_never = "" ; -; admin_controller.php line: 1432 +; admin_controller.php line: 1355 admin_controller_recrawl_1day = "" ; -; admin_controller.php line: 1433 +; admin_controller.php line: 1356 admin_controller_recrawl_2day = "" ; -; admin_controller.php line: 1434 +; admin_controller.php line: 1357 admin_controller_recrawl_3day = "" ; -; admin_controller.php line: 1435 +; admin_controller.php line: 1358 admin_controller_recrawl_7day = "" ; -; admin_controller.php line: 1436 +; admin_controller.php line: 1359 admin_controller_recrawl_14day = "" ; -; admin_controller.php line: 1519 +; admin_controller.php line: 1442 admin_controller_site_filter_update = "" ; -; admin_controller.php line: 1565 +; admin_controller.php line: 1488 admin_controller_select_machine = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1556 admin_controller_machine_added = "" ; -; admin_controller.php line: 1640 +; admin_controller.php line: 1563 admin_controller_machine_exists = "" ; -; admin_controller.php line: 1644 +; admin_controller.php line: 1567 admin_controller_machine_incomplete = "" ; -; admin_controller.php line: 1653 +; admin_controller.php line: 1576 admin_controller_machine_doesnt_exists = "" ; -; admin_controller.php line: 1670 +; admin_controller.php line: 1593 admin_controller_stop_service_first = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1606 admin_controller_machine_deleted = "" ; -; admin_controller.php line: 1722 +; admin_controller.php line: 1654 admin_controller_no_machine_log = "" ; -; admin_controller.php line: 1741 +; admin_controller.php line: 1683 admin_controller_machine_servers_updated = "" ; -; admin_controller.php line: 1745 +; admin_controller.php line: 1687 admin_controller_machine_no_action = "" ; -; admin_controller.php line: 1776 +; admin_controller.php line: 1718 admin_controller_select_localename = "" ; -; admin_controller.php line: 1820 +; admin_controller.php line: 1762 admin_controller_locale_added = "" ; -; admin_controller.php line: 1827 +; admin_controller.php line: 1769 admin_controller_localename_doesnt_exists = "" ; -; admin_controller.php line: 1836 +; admin_controller.php line: 1778 admin_controller_localename_deleted = "" ; -; admin_controller.php line: 1845 +; admin_controller.php line: 1787 admin_controller_select_staticpages = "" ; -; admin_controller.php line: 1864 +; admin_controller.php line: 1806 admin_controller_staticpage_updated = "" ; -; admin_controller.php line: 1887 +; admin_controller.php line: 1829 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1948 +; admin_controller.php line: 1890 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1953 +; admin_controller.php line: 1895 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1958 +; admin_controller.php line: 1900 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1964 +; admin_controller.php line: 1906 admin_controller_missing_required = "" ; -; admin_controller.php line: 1987 +; admin_controller.php line: 1929 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1992 +; admin_controller.php line: 1934 admin_controller_check_passed = "" ; -; admin_controller.php line: 1997 +; admin_controller.php line: 1939 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2067 +; admin_controller.php line: 2009 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2079 +; admin_controller.php line: 2021 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2088 +; admin_controller.php line: 2030 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2096 +; admin_controller.php line: 2038 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2107 +; admin_controller.php line: 2049 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2116 +; admin_controller.php line: 2058 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2127 +; admin_controller.php line: 2069 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2205 +; admin_controller.php line: 2147 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2219 +; admin_controller.php line: 2161 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2233 +; admin_controller.php line: 2175 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2269 +; admin_controller.php line: 2211 admin_controller_describe_robot = "" ; -; search_controller.php line: 132 +; search_controller.php line: 138 search_controller_logout_successful = "" ; -; search_controller.php line: 206 +; search_controller.php line: 215 search_controller_mix_info = "" ; -; search_controller.php line: 209 +; search_controller.php line: 218 search_controller_crawl_info = "" ; -; search_controller.php line: 263 +; search_controller.php line: 312 search_controller_no_index_set = "" ; -; search_controller.php line: 675 +; search_controller.php line: 730 search_controller_cached_version = "" ; -; search_controller.php line: 689 +; search_controller.php line: 744 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -576,13 +576,13 @@ configure_element_in_link = "" configure_element_ip_link = "" ; ; configure_element.php line: 219 -configure_element_queue_server = "" +configure_element_name_server = "" ; ; configure_element.php line: 221 -configure_element_queue_server_key = "" +configure_element_name_server_key = "" ; ; configure_element.php line: 227 -configure_element_queue_server_url = "" +configure_element_name_server_url = "" ; ; configure_element.php line: 233 configure_element_use_memcache = "" @@ -1038,34 +1038,37 @@ web_layout_description = "" ; web_layout.php line: 95 web_layout_query_statistics = "" ; -; web_layout.php line: 96 +; web_layout.php line: 99 web_layout_total_elapsed_time = "" ; -; web_layout.php line: 101 +; web_layout.php line: 104 web_layout_query_time = "" ; ; machinestatus_view.php line: 65 machinestatus_view_no_monitored = "" ; -; machinestatus_view.php line: 82 +; machinestatus_view.php line: 84 machinestatus_view_mirrors = "" ; -; machinestatus_view.php line: 96 +; machinestatus_view.php line: 87 +machinestatus_view_log = "" +; +; machinestatus_view.php line: 100 machinestatus_view_queue_server = "" ; -; machinestatus_view.php line: 98 +; machinestatus_view.php line: 102 machinestatus_view_log = "" ; -; machinestatus_view.php line: 107 +; machinestatus_view.php line: 111 machinestatus_view_no_queue_server = "" ; -; machinestatus_view.php line: 110 +; machinestatus_view.php line: 114 machinestatus_view_no_fetchers = "" ; -; machinestatus_view.php line: 120 +; machinestatus_view.php line: 124 machinestatus_view_fetchers = "" ; -; machinestatus_view.php line: 129 +; machinestatus_view.php line: 133 machinestatus_view_log = "" ; ; nocache_view.php line: 65 diff --git a/models/crawl_model.php b/models/crawl_model.php index 8da69b855..913e94f62 100755 --- a/models/crawl_model.php +++ b/models/crawl_model.php @@ -47,6 +47,11 @@ require_once BASE_DIR."/lib/crawl_constants.php"; */ require_once BASE_DIR."/lib/index_archive_bundle.php"; +/** + * Needed to be able to send data via http to remote queue_servers + */ +require_once BASE_DIR.'/lib/fetch_url.php'; + /** used to prevent cache page requests from being logged*/ define("NO_LOGGING", true); @@ -182,66 +187,7 @@ class CrawlModel extends Model implements CrawlConstants } - /** - * Gets a list of all index archives of crawls that have been conducted - * - * @param bool $return_arc_bundles whether index bundles used for indexing - * arc or other archive bundles should be included in the lsit - * @param bool $return_recrawls whether index archive bundles generated as - * a result of recrawling should be included in the result - * - * @return array Available IndexArchiveBundle directories and - * their meta information this meta information includes the time of - * the crawl, its description, the number of pages downloaded, and the - * number of partitions used in storing the inverted index - */ - function getCrawlList($return_arc_bundles = false, $return_recrawls = false) - { - $list = array(); - $dirs = glob(CRAWL_DIR.'/cache/*', GLOB_ONLYDIR); - foreach($dirs as $dir) { - if(strlen($pre_timestamp = - strstr($dir, self::index_data_base_name)) > 0) { - $crawl = array(); - $crawl['CRAWL_TIME'] = - substr($pre_timestamp, strlen(self::index_data_base_name)); - $info = IndexArchiveBundle::getArchiveInfo($dir); - $index_info = unserialize($info['DESCRIPTION']); - $crawl['DESCRIPTION'] = ""; - if(!$return_arc_bundles && isset($index_info['ARCFILE'])) { - continue; - } else if ($return_arc_bundles - && isset($index_info['ARCFILE'])) { - $crawl['DESCRIPTION'] = "ARCFILE::"; - } - if(!$return_recrawls && - isset($index_info[self::CRAWL_TYPE]) && - $index_info[self::CRAWL_TYPE] == self::ARCHIVE_CRAWL) { - continue; - } else if($return_recrawls && - isset($index_info[self::CRAWL_TYPE]) && - $index_info[self::CRAWL_TYPE] == self::ARCHIVE_CRAWL) { - $crawl['DESCRIPTION'] = "RECRAWL::"; - } - $schedules = glob(CRAWL_DIR.'/schedules/'. - self::schedule_data_base_name.$crawl['CRAWL_TIME']. - '/*/At*.txt'); - $crawl['RESUMABLE'] = (count($schedules) > 0) ? true: false; - $crawl['DESCRIPTION'] .= $index_info['DESCRIPTION']; - $crawl['VISITED_URLS_COUNT'] = - isset($info['VISITED_URLS_COUNT']) ? - $info['VISITED_URLS_COUNT'] : 0; - $crawl['COUNT'] = $info['COUNT']; - $crawl['NUM_DOCS_PER_PARTITION'] = - $info['NUM_DOCS_PER_PARTITION']; - $crawl['WRITE_PARTITION'] = $info['WRITE_PARTITION']; - $list[] = $crawl; - } - } - - return $list; - } /** * Returns all the files in $dir or its subdirectories with modfied times @@ -279,41 +225,7 @@ class CrawlModel extends Model implements CrawlConstants return $results; } - /** - * Deletes the crawl with the supplied timestamp if it exists. Also - * deletes any crawl mixes making use of this crawl - * - * @param string $timestamp a Unix timestamp - */ - function deleteCrawl($timestamp) - { - $this->db->unlinkRecursive( - CRAWL_DIR.'/cache/'.self::index_data_base_name . $timestamp, true); - $this->db->unlinkRecursive( - CRAWL_DIR.'/schedules/'.self::index_data_base_name . - $timestamp, true); - $this->db->unlinkRecursive( - CRAWL_DIR.'/schedules/' . self::schedule_data_base_name.$timestamp, - true); - $this->db->unlinkRecursive( - CRAWL_DIR.'/schedules/'.self::robot_data_base_name. - $timestamp, true); - - $this->db->selectDB(DB_NAME); - $sql = "SELECT DISTINCT MIX_TIMESTAMP FROM MIX_COMPONENTS WHERE ". - " CRAWL_TIMESTAMP='$timestamp'"; - $result = $this->db->execute($sql); - $rows = array(); - while($rows[] = $this->db->fetchArray($result)) ; - foreach($rows as $row) { - $this->deleteCrawlMix($row['MIX_TIMESTAMP']); - } - $current_timestamp = $this->getCurrentIndexDatabaseName(); - if($current_timestamp == $timestamp) { - $this->db->execute("DELETE FROM CURRENT_WEB_INDEX"); - } - } /** * Gets a list of all mixes of available crawls @@ -404,40 +316,7 @@ class CrawlModel extends Model implements CrawlConstants } return false; } - /** - * Get a description associated with a Web Crawl or Crawl Mix - * - * @param int $timestamp of crawl or mix in question - * @param bool $is_mix whether it is a mix or not - * @return array associative array containing item DESCRIPTION - */ - function getInfoTimestamp($timestamp, $is_mix = NULL) - { - if($is_mix === NULL) { - $is_mix = $this->isCrawlMix($timestamp); - } - $info = array(); - if($is_mix) { - $this->db->selectDB(DB_NAME); - - $sql = "SELECT MIX_TIMESTAMP, MIX_NAME FROM CRAWL_MIXES WHERE ". - " MIX_TIMESTAMP='$timestamp'"; - $result = $this->db->execute($sql); - $mix = $this->db->fetchArray($result); - $info['TIMESTAMP'] = $timestamp; - $info['DESCRIPTION'] = $mix['MIX_NAME']; - $info['IS_MIX'] = true; - } else { - $dir = CRAWL_DIR.'/cache/'.self::index_data_base_name.$timestamp; - if(file_exists($dir)) { - $info = IndexArchiveBundle::getArchiveInfo($dir); - $tmp = unserialize($info['DESCRIPTION']); - $info['DESCRIPTION'] = $tmp['DESCRIPTION']; - } - } - return $info; - } /** * Returns whether the supplied timestamp corresponds to a crawl mix @@ -714,5 +593,551 @@ EOT; $out = implode("\n", $n); file_put_contents(WORK_DIRECTORY."/crawl.ini", $out); } + + /** + * Get a description associated with a Web Crawl or Crawl Mix + * + * @param int $timestamp of crawl or mix in question + * @param array $machine_urls an array of urls of yioop queue servers + * + * @return array associative array containing item DESCRIPTION + */ + function getInfoTimestamp($timestamp, $machine_urls = NULL) + { + $is_mix = $this->isCrawlMix($timestamp); + $info = array(); + if($is_mix) { + $this->db->selectDB(DB_NAME); + + $sql = "SELECT MIX_TIMESTAMP, MIX_NAME FROM CRAWL_MIXES WHERE ". + " MIX_TIMESTAMP='$timestamp'"; + $result = $this->db->execute($sql); + $mix = $this->db->fetchArray($result); + $info['TIMESTAMP'] = $timestamp; + $info['DESCRIPTION'] = $mix['MIX_NAME']; + $info['IS_MIX'] = true; + } else { + if($machine_urls != NULL && + !$this->isSingleLocalhost($machine_urls)) { + $cache_file = CRAWL_DIR."/cache/Network".$timestamp.".txt"; + if(file_exists($cache_file) && filemtime($cache_file) + + 300 > time() ) { + return unserialize(file_get_contents($cache_file)); + } + $info_lists = $this->execMachines("getInfoTimestamp", + $machine_urls, serialize($timestamp)); + + $info = array(); + $info['DESCRIPTION'] = ""; + $info["COUNT"] = 0; + $info['VISITED_URLS_COUNT'] = 0; + foreach($info_lists as $info_list) { + $a_info = unserialize(webdecode( + $info_list[self::PAGE])); + if(isset($a_info['DESCRIPTION'])) { + $info['DESCRIPTION'] = $a_info['DESCRIPTION']; + } + if(isset($a_info['VISITED_URLS_COUNT'])) { + $info['VISITED_URLS_COUNT'] += + $a_info['VISITED_URLS_COUNT']; + } + if(isset($a_info['COUNT'])) { + $info['COUNT'] += + $a_info['COUNT']; + } + } + file_put_contents($cache_file, serialize($info)); + return $info; + } + $dir = CRAWL_DIR.'/cache/'.self::index_data_base_name.$timestamp; + if(file_exists($dir)) { + $info = IndexArchiveBundle::getArchiveInfo($dir); + $tmp = unserialize($info['DESCRIPTION']); + $info['DESCRIPTION'] = $tmp['DESCRIPTION']; + } + } + + return $info; + } + + /** + * Deletes the crawl with the supplied timestamp if it exists. Also + * deletes any crawl mixes making use of this crawl + * + * @param string $timestamp a Unix timestamp + * @param array $machine_urls an array of urls of yioop queue servers + */ + function deleteCrawl($timestamp, $machine_urls) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + //get rid of cache info on Name machine + $mask = CRAWL_DIR."/cache/NetworkCrawlList*.txt"; + array_map( "unlink", glob( $mask ) ); + @unlink(CRAWL_DIR."/cache/Network$timestamp.txt"); + //now get rid of files on queue_servers + $this->execMachines("deleteCrawl", + $machine_urls, serialize($timestamp)); + return; + } + + $this->db->unlinkRecursive( + CRAWL_DIR.'/cache/'.self::index_data_base_name . $timestamp, true); + $this->db->unlinkRecursive( + CRAWL_DIR.'/schedules/'.self::index_data_base_name . + $timestamp, true); + $this->db->unlinkRecursive( + CRAWL_DIR.'/schedules/' . self::schedule_data_base_name.$timestamp, + true); + $this->db->unlinkRecursive( + CRAWL_DIR.'/schedules/'.self::robot_data_base_name. + $timestamp, true); + + $this->db->selectDB(DB_NAME); + $sql = "SELECT DISTINCT MIX_TIMESTAMP FROM MIX_COMPONENTS WHERE ". + " CRAWL_TIMESTAMP='$timestamp'"; + $result = $this->db->execute($sql); + $rows = array(); + while($rows[] = $this->db->fetchArray($result)) ; + + foreach($rows as $row) { + $this->deleteCrawlMix($row['MIX_TIMESTAMP']); + } + $current_timestamp = $this->getCurrentIndexDatabaseName(); + if($current_timestamp == $timestamp) { + $this->db->execute("DELETE FROM CURRENT_WEB_INDEX"); + } + } + + /** + * Used to send a message to the queue_servers to start a crawl + * + * @param array $machine_urls an array of urls of yioop queue servers + */ + function sendStartCrawlMessage($crawl_params, $seed_info = NULL, + $machine_urls = NULL) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + $params = array($crawl_params, $seed_info); + $this->execMachines("sendStartCrawlMessage", + $machine_urls, serialize($params)); + return; + } + + $info_string = serialize($crawl_params); + file_put_contents( + CRAWL_DIR."/schedules/queue_server_messages.txt", + $info_string); + chmod(CRAWL_DIR."/schedules/queue_server_messages.txt", + 0777); + if($seed_info != NULL) { + $scheduler_info[self::HASH_SEEN_URLS] = array(); + + foreach ($seed_info['seed_sites']['url'] as $site) { + $scheduler_info[self::TO_CRAWL][] = array($site, 1.0); + } + $scheduler_string = "\n".webencode( + gzcompress(serialize($scheduler_info))); + file_put_contents( + CRAWL_DIR."/schedules/".self::schedule_start_name, + $scheduler_string); + } + } + + /** + * Used to send a message to the queue_servers to stop a crawl + */ + function sendStopCrawlMessage($machine_urls = NULL) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + $this->execMachines("sendStopCrawlMessage", $machine_urls); + return; + } + + $info = array(); + $info[self::STATUS] = "STOP_CRAWL"; + $info_string = serialize($info); + file_put_contents( + CRAWL_DIR."/schedules/queue_server_messages.txt", + $info_string); + } + + /** + * Gets a list of all index archives of crawls that have been conducted + * + * @param bool $return_arc_bundles whether index bundles used for indexing + * arc or other archive bundles should be included in the lsit + * @param bool $return_recrawls whether index archive bundles generated as + * a result of recrawling should be included in the result + * @param array $machine_urls an array of urls of yioop queue servers + * @param bool $cache whether to try to get/set the data to a cache file + * + * @return array Available IndexArchiveBundle directories and + * their meta information this meta information includes the time of + * the crawl, its description, the number of pages downloaded, and the + * number of partitions used in storing the inverted index + */ + function getCrawlList($return_arc_bundles = false, $return_recrawls = false, + $machine_urls = NULL, $cache = false) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + + $pre_arg = ($return_arc_bundles && $return_recrawls) ? 3 : + ($return_recrawls) ? 2 : ($return_arc_bundles) ? 1 : 0; + $cache_file = CRAWL_DIR."/cache/NetworkCrawlList$pre_arg.txt"; + if($cache && file_exists($cache_file) && filemtime($cache_file) + + 300 > time() ) { + return unserialize(file_get_contents($cache_file)); + } + $arg = "arg=$pre_arg"; + $list_strings = $this->execMachines("getCrawlList", + $machine_urls, $arg); + $list = $this->aggregateCrawlList($list_strings); + if($cache) { + file_put_contents($cache_file, serialize($list)); + } + return $list; + } + $list = array(); + $dirs = glob(CRAWL_DIR.'/cache/*', GLOB_ONLYDIR); + + foreach($dirs as $dir) { + if(strlen($pre_timestamp = + strstr($dir, self::index_data_base_name)) > 0) { + $crawl = array(); + $crawl['CRAWL_TIME'] = + substr($pre_timestamp, strlen(self::index_data_base_name)); + $info = IndexArchiveBundle::getArchiveInfo($dir); + $index_info = unserialize($info['DESCRIPTION']); + $crawl['DESCRIPTION'] = ""; + if(!$return_arc_bundles && isset($index_info['ARCFILE'])) { + continue; + } else if ($return_arc_bundles + && isset($index_info['ARCFILE'])) { + $crawl['DESCRIPTION'] = "ARCFILE::"; + } + if(!$return_recrawls && + isset($index_info[self::CRAWL_TYPE]) && + $index_info[self::CRAWL_TYPE] == self::ARCHIVE_CRAWL) { + continue; + } else if($return_recrawls && + isset($index_info[self::CRAWL_TYPE]) && + $index_info[self::CRAWL_TYPE] == self::ARCHIVE_CRAWL) { + $crawl['DESCRIPTION'] = "RECRAWL::"; + } + $schedules = glob(CRAWL_DIR.'/schedules/'. + self::schedule_data_base_name.$crawl['CRAWL_TIME']. + '/*/At*.txt'); + $crawl['RESUMABLE'] = (count($schedules) > 0) ? true: false; + $crawl['DESCRIPTION'] .= $index_info['DESCRIPTION']; + $crawl['VISITED_URLS_COUNT'] = + isset($info['VISITED_URLS_COUNT']) ? + $info['VISITED_URLS_COUNT'] : 0; + $crawl['COUNT'] = $info['COUNT']; + $crawl['NUM_DOCS_PER_PARTITION'] = + $info['NUM_DOCS_PER_PARTITION']; + $crawl['WRITE_PARTITION'] = $info['WRITE_PARTITION']; + $list[] = $crawl; + } + } + + return $list; + } + + /** + * + */ + function aggregateCrawlList($list_strings, $data_field = NULL) + { + $pre_list = array(); + foreach($list_strings as $list_string) { + $a_list = unserialize(webdecode( + $list_string[self::PAGE])); + if($data_field != NULL) { + $a_list = $a_list[$data_field]; + } + if(is_array($a_list)) { + foreach($a_list as $elt) { + $timestamp = $elt['CRAWL_TIME']; + if(!isset($pre_list[$timestamp])) { + $pre_list[$timestamp] = $elt; + } else { + $pre_list[$timestamp]["VISITED_URLS_COUNT"] += + $elt["VISITED_URLS_COUNT"]; + $pre_list[$timestamp]["COUNT"] += + $elt["COUNT"]; + $pre_list[$timestamp]['RESUMABLE'] |= $elt['RESUMABLE']; + } + } + } + } + $list = array_values($pre_list); + return $list; + } + /** + * + */ + function crawlStalled($machine_urls = NULL) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + $outputs = $this->execMachines("crawlStalled", $machine_urls); + return $this->aggregateStalled($outputs); + } + + if(file_exists(CRAWL_DIR."/schedules/crawl_status.txt")) { + //assume if status not updated forCRAWL_TIME_OUT + // crawl not active (do check for both scheduler and indexer) + if(filemtime( + CRAWL_DIR."/schedules/crawl_status.txt") + + CRAWL_TIME_OUT < time() ) { + return true; + } + $schedule_status_exists = + file_exists(CRAWL_DIR."/schedules/schedule_status.txt"); + if($schedule_status_exists && + filemtime(CRAWL_DIR."/schedules/schedule_status.txt") + + CRAWL_TIME_OUT < time() ) { + return true; + } + } + return false; + } + + /** + * + */ + function aggregateStalled($stall_statuses, $data_field = NULL) + { + foreach($stall_statuses as $status) { + $stall_status = unserialize(webdecode($status[self::PAGE])); + if($data_field != NULL) { + $stall_status = $stall_status[$data_field]; + } + if($stall_status === true) { + return true; + } + } + return false; + } + + /** + * + */ + function crawlStatus($machine_urls = NULL) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + $status_strings = $this->execMachines("crawlStatus", $machine_urls); + return $this->aggregateStatuses($status_strings); + } + + $data = array(); + $crawl_status_exists = + file_exists(CRAWL_DIR."/schedules/crawl_status.txt"); + if($crawl_status_exists) { + $crawl_status = + @unserialize(file_get_contents( + CRAWL_DIR."/schedules/crawl_status.txt")); + } + $schedule_status_exists = + file_exists(CRAWL_DIR."/schedules/schedule_status.txt"); + if($schedule_status_exists) { + $schedule_status = + @unserialize(file_get_contents( + CRAWL_DIR."/schedules/schedule_status.txt")); + if(isset($schedule_status[self::TYPE]) && + $schedule_status[self::TYPE] == self::SCHEDULER) { + $data['SCHEDULER_PEAK_MEMORY'] = + isset($schedule_status[self::MEMORY_USAGE]) ? + $schedule_status[self::MEMORY_USAGE] : 0; + } + } + + $data = (isset($crawl_status) && is_array($crawl_status)) ? + array_merge($data, $crawl_status) : $data; + + if(isset($data['VISITED_COUNT_HISTORY']) && + count($data['VISITED_COUNT_HISTORY']) > 1) { + $recent = array_shift($data['VISITED_COUNT_HISTORY']); + $data["MOST_RECENT_TIMESTAMP"] = $recent[0]; + $oldest = array_pop($data['VISITED_COUNT_HISTORY']); + unset($data['VISITED_COUNT_HISTORY']); + $change_in_time_hours = floatval(time() - $oldest[0])/3600.; + $change_in_urls = $recent[1] - $oldest[1]; + $data['VISITED_URLS_COUNT_PER_HOUR'] = ($change_in_time_hours > 0) ? + $change_in_urls/$change_in_time_hours : 0; + } else { + $data['VISITED_URLS_COUNT_PER_HOUR'] = 0; + } + + return $data; + } + + /** + * + */ + function aggregateStatuses($status_strings, $data_field = NULL) + { + $status['WEBAPP_PEAK_MEMORY'] = 0; + $status['FETCHER_PEAK_MEMORY'] = 0; + $status['QUEUE_PEAK_MEMORY'] = 0; + $status["SCHEDULER_PEAK_MEMORY"] = 0; + $status["COUNT"] = 0; + $status["VISITED_URLS_COUNT"] = 0; + $status["VISITED_URLS_COUNT_PER_HOUR"] = 0; + $status["MOST_RECENT_TIMESTAMP"] = 0; + $status["DESCRIPTION"] = ""; + $status['MOST_RECENT_FETCHER'] = ""; + $status['MOST_RECENT_URLS_SEEN'] = array(); + $status['CRAWL_TIME'] = 0; + + foreach($status_strings as $status_string) { + $a_status = unserialize(webdecode( + $status_string[self::PAGE])); + if($data_field != NULL) { + $a_status = $a_status[$data_field]; + } + $count_fields = array("COUNT", "VISITED_URLS_COUNT_PER_HOUR", + "VISITED_URLS_COUNT"); + foreach($count_fields as $field) { + if(isset($a_status[$field])) { + $status[$field] += $a_status[$field]; + } + } + if(isset($a_status["CRAWL_TIME"]) && $a_status["CRAWL_TIME"] > + $status['CRAWL_TIME']) { + $status['CRAWL_TIME'] = $a_status["CRAWL_TIME"]; + $text_fields = array("DESCRIPTION", "MOST_RECENT_FETCHER"); + foreach($text_fields as $field) { + if(isset($a_status[$field])) { + $status[$field] = $a_status[$field]; + } + } + } + if(isset($a_status["MOST_RECENT_TIMESTAMP"]) && + $status["MOST_RECENT_TIMESTAMP"] <= + $a_status["MOST_RECENT_TIMESTAMP"]) { + $status["MOST_RECENT_TIMESTAMP"] = + $a_status["MOST_RECENT_TIMESTAMP"]; + if(isset($a_status['MOST_RECENT_URLS_SEEN'])) { + $status['MOST_RECENT_URLS_SEEN'] = + $a_status['MOST_RECENT_URLS_SEEN']; + } + } + $memory_fields = array("WEBAPP_PEAK_MEMORY", + "FETCHER_PEAK_MEMORY", "QUEUE_PEAK_MEMORY", + "SCHEDULER_PEAK_MEMORY"); + foreach($memory_fields as $field) { + $status[$field] = (!isset($a_status[$field])) ? 0 : + max($status[$field], $a_status[$field]); + } + } + return $status; + } + + /** + * + */ + function combinedCrawlInfo($machine_urls = NULL) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + $combined_strings = + $this->execMachines("combinedCrawlInfo", $machine_urls); + $combined = array(); + $combined[] = $this->aggregateStalled($combined_strings, + 0); + $combined[] = $this->aggregateStatuses($combined_strings, + 1); + $combined[] = $this->aggregateCrawlList($combined_strings, + 2); + return $combined; + } + + $combined = array(); + $combined[] = $this->crawlStalled(); + $combined[] = $this->crawlStatus(); + $combined[] = $this->getCrawlList(false, true); + return $combined; + } + + /** + * + */ + function injectUrlsCurrentCrawl($inject_urls, $machine_urls = NULL) + { + if($machine_urls != NULL && !$this->isSingleLocalhost($machine_urls)) { + $this->execMachines("injectUrlsCurrentCrawl", $machine_urls, + serialize($inject_urls)); + return; + } + + $dir = CRAWL_DIR."/schedules/". + self::schedule_data_base_name. $timestamp; + if(!file_exists($dir)) { + mkdir($dir); + chmod($dir, 0777); + } + $day = floor($timestamp/86400) - 1; + //want before all other schedules, + // execute next + $dir .= "/$day"; + if(!file_exists($dir)) { + mkdir($dir); + chmod($dir, 0777); + } + $count = count($inject_urls); + if($count > 0 ) { + $now = time(); + $schedule_data = array(); + $schedule_data[self::SCHEDULE_TIME] = + $timestamp; + $schedule_data[self::TO_CRAWL] = array(); + for($i = 0; $i < $count; $i++) { + $url = $inject_urls[$i]; + $hash = crawlHash($now.$url); + $schedule_data[self::TO_CRAWL][] = + array($url, 1, $hash); + } + $data_string = webencode( + gzcompress(serialize($schedule_data))); + $data_hash = crawlHash($data_string); + file_put_contents($dir."/At1From127-0-0-1". + "WithHash$data_hash.txt", $data_string); + return true; + } + return false; + } + + /** + * + */ + function execMachines($command, $machine_urls, $arg = NULL) + { + $num_machines = count($machine_urls); + $time = time(); + $session = md5($time . AUTH_KEY); + $query = "c=crawl&a=$command&time=$time&session=$session" . + "&num=$num_machines"; + if($arg != NULL) { + $arg = webencode($arg); + $query .= "&arg=$arg"; + } + + $sites = array(); + $post_data = array(); + $i = 0; + foreach($machine_urls as $machine_url) { + $sites[$i][CrawlConstants::URL] = $machine_url; + $post_data[$i] = $query."&i=$i"; + $i++; + } + + $outputs = array(); + if(count($sites) > 0) { + $outputs = FetchUrl::getPages($sites, false, 0, NULL, self::URL, + self::PAGE, true, $post_data); + } + + return $outputs; + } + } ?> diff --git a/models/machine_model.php b/models/machine_model.php index 5a8fc35ee..0b469a24a 100644 --- a/models/machine_model.php +++ b/models/machine_model.php @@ -69,21 +69,47 @@ class MachineModel extends Model { $this->db->selectDB(DB_NAME); - $roles = array(); + $machines = array(); $sql = "SELECT * FROM MACHINE ORDER BY NAME DESC"; $result = $this->db->execute($sql); $i = 0; - while($roles[$i] = $this->db->fetchArray($result)) { + while($machines[$i] = $this->db->fetchArray($result)) { $i++; } - unset($roles[$i]); //last one will be null + unset($machines[$i]); //last one will be null - return $roles; + return $machines; + + } + + /** + * Returns urls for all the queue_servers stored in the DB + * + * @return array machine names + */ + function getQueueServerUrls() + { + $this->db->selectDB(DB_NAME); + $machines = array(); + + $sql = "SELECT URL FROM MACHINE WHERE HAS_QUEUE_SERVER > 0 ". + "ORDER BY NAME DESC"; + + $result = $this->db->execute($sql); + $i = 0; + + while($row = $this->db->fetchArray($result)) { + $machines[$i] = $row["URL"]; + $i++; + } + unset($machines[$i]); //last one will be null + + return $machines; } /** diff --git a/models/model.php b/models/model.php index 44b6aca17..97df13b41 100755 --- a/models/model.php +++ b/models/model.php @@ -39,6 +39,10 @@ require_once BASE_DIR."/models/datasources/".DBMS."_manager.php"; /** Used to handle curl and multi curl page requests */ require_once BASE_DIR."/lib/fetch_url.php"; +/** For checking if a url is on localhost */ +require_once BASE_DIR."/lib/url_parser.php"; + + /** Used to load common constants among crawl components */ require_once BASE_DIR."/lib/crawl_constants.php"; @@ -238,7 +242,7 @@ class Model implements CrawlConstants if( $out_len < $description_length) { $str = mb_substr($text, $low, $high - $low); - if(isset($snippets[$i]) && + if(isset($snippets[$i]) && $snippets[$i] != "" && mb_stristr($str, $snippets[$i])) { $i++; } @@ -314,5 +318,21 @@ class Model implements CrawlConstants { return !in_array($dbms, array("sqlite", "sqlite3")); } + + + /** + * Used to determine if an action involves just one yioop instance on + * the current local machine or not + * + * @param array $machine_urls urls of yioop instances to which the action + * applies + * @return bool whether it involves a single local yioop instance (true) + * or not (false) + */ + function isSingleLocalhost($machine_urls) + { + return count($machine_urls) == 1 && + UrlParser::isLocalhostUrl($machine_urls[0]); + } } ?> diff --git a/models/phrase_model.php b/models/phrase_model.php index a95a6340b..3594954b7 100755 --- a/models/phrase_model.php +++ b/models/phrase_model.php @@ -42,9 +42,11 @@ if(!defined("POST_PROCESSING")) { } /** For crawlHash function */ require_once BASE_DIR."/lib/utility.php"; + /** For extractPhrasesAndCount function */ require_once BASE_DIR."/lib/phrase_parser.php"; + /** * Used to look up words and phrases in the inverted index * associated with a given crawl @@ -95,6 +97,7 @@ class PhraseModel extends Model */ var $query_info; + /** * Number of pages to cache in one go in memcache or filecache * Size chosen based on 1MB max object size for memcache or filecache @@ -207,14 +210,15 @@ class PhraseModel extends Model * and then potentially restored in cache * @param int $raw ($raw == 0) normal grouping, ($raw == 1) * no grouping but page look-up for links, ($raw == 2) - * no grouping done on data - * + * no grouping done on data' + * @param array $queue_servers a list of urls of yioop machines which might + * be used during lookup * @return array an array of summary data */ function getPhrasePageResults( $input_phrase, $low = 0, $results_per_page = NUM_RESULTS_PER_PAGE, $format = true, $filter = NULL, $use_cache_if_allowed = true, - $raw = 0) + $raw = 0, $queue_servers = array()) { if(QUERY_STATISTICS) { $indent= " "; @@ -333,7 +337,8 @@ class PhraseModel extends Model } $out_results = $this->getSummariesByHash($word_structs, - $low, $phrase_num, $filter, $use_cache_if_allowed, $raw); + $low, $phrase_num, $filter, $use_cache_if_allowed, $raw, + $queue_servers, $phrase); if(isset($out_results['PAGES']) && count($out_results['PAGES']) != 0) { @@ -469,6 +474,7 @@ class PhraseModel extends Model $phrase = $this->guessSemantics($phrase); $phrase = $this->parseIfConditions($phrase); $phrase_string = $phrase; + $phrase_string = str_replace("&", "&", $phrase_string); $meta_words = array('link:', 'site:', 'version:', 'modified:', 'filetype:', 'info:', '\-', 'os:', 'server:', 'date:', 'index:', 'i:', 'ip:', 'weight:', 'w:', 'u:', @@ -741,11 +747,16 @@ class PhraseModel extends Model * @param int $raw ($raw == 0) normal grouping, ($raw == 1) * no grouping but page look-up for links, ($raw == 2) * no grouping done on data + * @param array $queue_servers a list of urls of yioop machines which might + * be used during lookup + * @param string $original_query if set, the original query that corresponds + * to $word_structs * * @return array document summaries */ function getSummariesByHash($word_structs, $limit, $num, &$filter, - $use_cache_if_allowed = true, $raw = 0) + $use_cache_if_allowed = true, $raw = 0, $queue_servers = array(), + $original_query = "") { global $CACHE; @@ -788,21 +799,32 @@ class PhraseModel extends Model } } - $query_iterator = $this->getQueryIterator($word_structs, $filter, $raw); + $query_iterator = $this->getQueryIterator($word_structs, $filter, $raw, + $queue_servers, $original_query); $num_retrieved = 0; $pages = array(); - while(is_object($query_iterator) && - is_array($next_docs = $query_iterator->nextDocsWithWord()) && - $num_retrieved < $to_retrieve) { + + $isLocal = ($queue_servers == array()) || + $this->isSingleLocalhost($queue_servers); + + while($num_retrieved < $to_retrieve && is_object($query_iterator) && + is_array($next_docs = $query_iterator->nextDocsWithWord()) ) { foreach($next_docs as $doc_key => $doc_info) { - $summary = & $doc_info[CrawlConstants::SUMMARY]; - $tmp = unserialize($query_iterator->getIndex( - $doc_key)->description); - $doc_info[self::CRAWL_TIME] = $tmp[self::CRAWL_TIME]; - unset($doc_info[CrawlConstants::SUMMARY]); - if(is_array($summary)) { - $pages[] = array_merge($doc_info, $summary); + if($isLocal) { + $summary = & $doc_info[CrawlConstants::SUMMARY]; + + $tmp = unserialize($query_iterator->getIndex( + $doc_key)->description); + + $doc_info[self::CRAWL_TIME] = $tmp[self::CRAWL_TIME]; + unset($doc_info[CrawlConstants::SUMMARY]); + if(is_array($summary)) { + $pages[] = array_merge($doc_info, $summary); + $num_retrieved++; + } + } else { + $pages[] = $doc_info; $num_retrieved++; } } @@ -818,20 +840,22 @@ class PhraseModel extends Model $num_fields = count($subscore_fields); // Compute Reciprocal Rank Fusion Score $alpha = 600/$num_fields; - foreach($subscore_fields as $field) { - orderCallback($pages[0], $pages[0], $field); - usort($pages, "orderCallback"); - $score = 0; - for($i = 0; $i < $result_count; $i++) { - if($i > 0) { - if($pages[$i - 1][$field] != $pages[$i][$field]) { - $score++; + if(isset($pages[0])) { + foreach($subscore_fields as $field) { + orderCallback($pages[0], $pages[0], $field); + usort($pages, "orderCallback"); + $score = 0; + for($i = 0; $i < $result_count; $i++) { + if($i > 0) { + if($pages[$i - 1][$field] != $pages[$i][$field]) { + $score++; + } } + $pages[$i][CrawlConstants::SCORE] += $alpha/(60 + $score); } - $pages[$i][CrawlConstants::SCORE] += $alpha/(60 + $score); } + orderCallback($pages[0], $pages[0], CrawlConstants::SCORE); } - orderCallback($pages[0], $pages[0], CrawlConstants::SCORE); usort($pages, "orderCallback"); if($num_retrieved < $to_retrieve) { @@ -860,7 +884,6 @@ class PhraseModel extends Model $results['PAGES'] = array_slice($results['PAGES'], $limit - $start_slice, $num); - return $results; } @@ -882,65 +905,83 @@ class PhraseModel extends Model * @param int $raw ($raw == 0) normal grouping, ($raw == 1) * no grouping but page look-up for links, ($raw == 2) * no grouping done on data + * @param array $queue_servers a list of urls of yioop machines which might + * be used during lookup + * @param string $original_query if set, the orginal query that corresponds + * to $word_structs * * @return &object an iterator for iterating through results to the * query */ - function getQueryIterator($word_structs, &$filter, $raw = 0) + function getQueryIterator($word_structs, &$filter, $raw = 0, + $queue_servers = array(), $original_query = "") { $iterators = array(); $total_iterators = 0; - foreach($word_structs as $word_struct) { - if(!is_array($word_struct)) { continue;} - $word_keys = $word_struct["KEYS"]; - $distinct_word_keys = array_unique($word_keys); - $restrict_phrases = $word_struct["RESTRICT_PHRASES"]; - $disallow_keys = $word_struct["DISALLOW_KEYS"]; - $index_archive = $word_struct["INDEX_ARCHIVE"]; - - $weight = $word_struct["WEIGHT"]; - $num_word_keys = count($word_keys); - $total_iterators = count($distinct_word_keys); - $word_iterators = array(); - $word_iterator_map = array(); - if($num_word_keys < 1) {continue;} - - for($i = 0; $i < $total_iterators; $i++) { - $word_iterators[$i] = - new WordIterator($distinct_word_keys[$i], $index_archive, - false, $filter); - foreach ($word_keys as $index => $key) { - if($key == $distinct_word_keys[$i]){ - $word_iterator_map[$index] = $i; + $network_flag = false; + if($queue_servers != array()) { + if(!$this->isSingleLocalhost($queue_servers)) { + $network_flag = true; + $total_iterators = 1; + $num_servers = count($queue_servers); + $iterators[0] = new NetworkIterator($original_query, + $queue_servers, $this->index_name); + } + + } + if(!$network_flag) { + foreach($word_structs as $word_struct) { + if(!is_array($word_struct)) { continue;} + $word_keys = $word_struct["KEYS"]; + $distinct_word_keys = array_unique($word_keys); + $restrict_phrases = $word_struct["RESTRICT_PHRASES"]; + $disallow_keys = $word_struct["DISALLOW_KEYS"]; + $index_archive = $word_struct["INDEX_ARCHIVE"]; + + $weight = $word_struct["WEIGHT"]; + $num_word_keys = count($word_keys); + $total_iterators = count($distinct_word_keys); + $word_iterators = array(); + $word_iterator_map = array(); + if($num_word_keys < 1) {continue;} + + for($i = 0; $i < $total_iterators; $i++) { + $word_iterators[$i] = + new WordIterator($distinct_word_keys[$i], + $index_archive, false, $filter); + foreach ($word_keys as $index => $key) { + if($key == $distinct_word_keys[$i]){ + $word_iterator_map[$index] = $i; + } } } - } - $num_disallow_keys = count($disallow_keys); - if($num_disallow_keys > 0) { - for($i = 0; $i < $num_disallow_keys; $i++) { - $disallow_iterator = - new WordIterator($disallow_keys[$i], $index_archive, - false, $filter); - $word_iterators[$num_word_keys + $i] = - new NegationIterator($disallow_iterator); + $num_disallow_keys = count($disallow_keys); + if($num_disallow_keys > 0) { + for($i = 0; $i < $num_disallow_keys; $i++) { + $disallow_iterator = + new WordIterator($disallow_keys[$i], $index_archive, + false, $filter); + $word_iterators[$num_word_keys + $i] = + new NegationIterator($disallow_iterator); + } } - } - $num_word_keys += $num_disallow_keys; + $num_word_keys += $num_disallow_keys; - if($num_word_keys == 1) { - $base_iterator = $word_iterators[0]; - } else { - $base_iterator = new IntersectIterator( - $word_iterators,$word_iterator_map); - } - if($restrict_phrases == NULL && $disallow_keys == array() && - $weight == 1) { - $iterators[] = $base_iterator; - } else { - $iterators[] = new PhraseFilterIterator($base_iterator, - $restrict_phrases, $weight); - } + if($num_word_keys == 1) { + $base_iterator = $word_iterators[0]; + } else { + $base_iterator = new IntersectIterator( + $word_iterators,$word_iterator_map); + } + if($restrict_phrases == NULL && $disallow_keys == array() && + $weight == 1) { + $iterators[] = $base_iterator; + } else { + $iterators[] = new PhraseFilterIterator($base_iterator, + $restrict_phrases, $weight); + } + } } $num_iterators = count($iterators); @@ -964,6 +1005,11 @@ class PhraseModel extends Model new GroupIterator($union_iterator, $total_iterators); } + if($network_flag) { + $union_iterator->results_per_block = + 1.1* $group_iterator->results_per_block/$num_servers; + } + return $group_iterator; } diff --git a/models/profile_model.php b/models/profile_model.php index 9df2aa8d1..40423c921 100644 --- a/models/profile_model.php +++ b/models/profile_model.php @@ -52,7 +52,7 @@ class ProfileModel extends Model var $profile_fields = array('USER_AGENT_SHORT', 'DEFAULT_LOCALE', 'DEBUG_LEVEL', 'DBMS','DB_HOST', 'DB_NAME', 'DB_USER', 'DB_PASSWORD', - 'QUEUE_SERVER', 'AUTH_KEY', "ROBOT_DESCRIPTION", 'WEB_URI', + 'NAME_SERVER', 'AUTH_KEY', "ROBOT_DESCRIPTION", 'WEB_URI', 'USE_MEMCACHE', 'MEMCACHE_SERVERS', 'USE_FILECACHE', 'CACHE_LINK', 'SIMILAR_LINK', 'IN_LINK', 'IP_LINK', 'SIGNIN_LINK', 'ROBOT_INSTANCE', "WEB_ACCESS", "RSS_ACCESS", "API_ACCESS", diff --git a/tests/url_parser_test.php b/tests/url_parser_test.php index debaf1329..20f12e024 100644 --- a/tests/url_parser_test.php +++ b/tests/url_parser_test.php @@ -69,7 +69,9 @@ class UrlParserTest extends UnitTest public function canonicalLinkTestCase() { $test_links = array( - array("/bob.html", "http://www.example.com/", + array(".", "http://www.example.com/", + "http://www.example.com/", "root dir0"), + array("/bob.html", "http://www.example.com/", "http://www.example.com/bob.html", "root dir1"), array("bob.html", "http://www.example.com/", "http://www.example.com/bob.html", "root dir2"), @@ -79,8 +81,18 @@ class UrlParserTest extends UnitTest "http://www.example.com/bob", "root dir4"), array("http://print.bob.com/bob", "http://www.example.com", "http://print.bob.com/bob", "root dir5"), + array("/.", "http://www.example.com/", + "http://www.example.com/", "root dir6"), + array("//slashdot.org", "http://www.slashdot.org", + "http://slashdot.org/", "slashdot dir"), array("bob", "http://www.example.com/a", "http://www.example.com/a/bob", "sub dir1"), + array("../bob", "http://www.example.com/a", + "http://www.example.com/bob", "sub dir2"), + array("../../bob", "http://www.example.com/a", + NULL, "sub dir3"), + array("./bob", "http://www.example.com/a", + "http://www.example.com/a/bob", "sub dir4"), array("bob.html?a=1", "http://www.example.com/a", "http://www.example.com/a/bob.html?a=1", "query 1"), array("bob?a=1&b=2", "http://www.example.com/a", diff --git a/views/crawlstatus_view.php b/views/crawlstatus_view.php index 62a57e879..f46c2ce42 100755 --- a/views/crawlstatus_view.php +++ b/views/crawlstatus_view.php @@ -60,7 +60,7 @@ class CrawlstatusView extends View <h2><?php e(tl('crawlstatus_view_currently_processing')); ?></h2> <p><b><?php e(tl('crawlstatus_view_description')); ?></b> <?php - if(isset($data['DESCRIPTION'])) { + if(isset($data['DESCRIPTION']) && $data["CRAWL_RUNNING"]) { switch($data['DESCRIPTION']) { case 'BEGIN_CRAWL': diff --git a/views/elements/configure_element.php b/views/elements/configure_element.php index 3d2da3162..d5b04a8bf 100644 --- a/views/elements/configure_element.php +++ b/views/elements/configure_element.php @@ -217,17 +217,17 @@ class ConfigureElement extends Element </fieldset> </div> <div class="topmargin"><fieldset><legend><?php - e(tl('configure_element_queue_server'))?></legend> + e(tl('configure_element_name_server'))?></legend> <div ><b><label for="queue-fetcher-salt"><?php - e(tl('configure_element_queue_server_key'))?></label></b> + e(tl('configure_element_name_server_key'))?></label></b> <input type="text" id="queue-fetcher-salt" name="AUTH_KEY" value="<?php e($data['AUTH_KEY']); ?>" class="widefield" /> </div> <div class="topmargin"><b><label for="queue-server-url"><?php - e(tl('configure_element_queue_server_url'))?></label></b> - <input type="text" id="queue-server-url" name="QUEUE_SERVER" - value="<?php e($data['QUEUE_SERVER']); ?>" + e(tl('configure_element_name_server_url'))?></label></b> + <input type="text" id="queue-server-url" name="NAME_SERVER" + value="<?php e($data['NAME_SERVER']); ?>" class="extrawidefield" /> </div> <div class="topmargin"><label for="use-memcache"><b><?php