diff --git a/configs/config.php b/configs/config.php index 03762df8f..195f98ec0 100755 --- a/configs/config.php +++ b/configs/config.php @@ -92,11 +92,13 @@ if(file_exists(WORK_DIRECTORY."/profile.php")) { define('DEFAULT_LOCALE', "en-US"); define('AUTH_KEY', 0); define('USE_MEMCACHE', false); + define('USE_FILECACHE', false); define('CACHE_LINK', true); define('SIMILAR_LINK', true); define('IN_LINK', true); define('IP_LINK', true); define('SIGNIN_LINK', true); + $INDEXING_PLUGINS = array(); } if((DEBUG_LEVEL & ERROR_INFO) == ERROR_INFO) { diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index ddc3b7943..fe2652b1a 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -1346,7 +1346,7 @@ class AdminController extends Controller implements CrawlConstants array("name" => "GD Graphics Library", "check"=>"imagecreate", "type"=>"function"), array("name" => "SQLite3 Library", - "check"=>"SQLite3", "type"=>"class"), + "check"=>"SQLite3|PDO", "type"=>"class"), array("name" => "Multibyte Character Library", "check"=>"mb_internal_encoding", "type"=>"function"), ); @@ -1359,9 +1359,16 @@ class AdminController extends Controller implements CrawlConstants $comma = ""; foreach($required_items as $item) { $check_function = $item["type"]."_exists"; - if(!$check_function($item["check"])) { - $comma = ", "; + $check_parts = explode("|", $item["check"]); + $check_flag = true; + foreach($check_parts as $check) { + if($check_function($check)) { + $check_flag = false; + } + } + if($check_flag) { $missing_required .= $comma.$item["name"]; + $comma = ", "; } } @@ -1391,11 +1398,18 @@ class AdminController extends Controller implements CrawlConstants $missing_optional = ""; $comma = ""; - foreach($required_items as $item) { + foreach($optional_items as $item) { $check_function = $item["type"]."_exists"; - if(!$check_function($item["check"])) { - $comma = ", "; + $check_parts = explode("|", $item["check"]); + $check_flag = true; + foreach($check_parts as $check) { + if($check_function($check)) { + $check_flag = false; + } + } + if($check_flag) { $missing_optional .= $comma.$item["name"]; + $comma = ", "; } } @@ -1573,7 +1587,8 @@ class AdminController extends Controller implements CrawlConstants } if(!isset($data[$field])) { $data[$field] = ""; - if(in_array($field, array('USE_MEMCACHE', 'IP_LINK', + if(in_array($field, array( + 'USE_FILECACHE', 'USE_MEMCACHE', 'IP_LINK', 'CACHE_LINK', 'SIMILAR_LINK', 'IN_LINK', 'SIGNIN_LINK'))) { $profile[$field] = false; diff --git a/controllers/search_controller.php b/controllers/search_controller.php index 8bc7ea12b..66d7c7f74 100755 --- a/controllers/search_controller.php +++ b/controllers/search_controller.php @@ -252,7 +252,8 @@ class SearchController extends Controller implements CrawlConstants $this->phraseModel->additional_meta_words = array(); foreach($this->indexing_plugins as $plugin) { $plugin_name = ucfirst($plugin)."Plugin"; - $tmp_meta_words = $plugin_name::getAdditionalMetaWords(); + $plugin_obj = new $plugin_name(); + $tmp_meta_words = $plugin_obj->getAdditionalMetaWords(); $this->phraseModel->additional_meta_words = array_merge($this->phraseModel->additional_meta_words, $tmp_meta_words); diff --git a/index.php b/index.php index b550dff7c..03e04e436 100755 --- a/index.php +++ b/index.php @@ -52,13 +52,23 @@ session_start(); * Sets up DB to be used */ require_once(BASE_DIR."/models/datasources/".DBMS."_manager.php"); +/** + * Load FileCache class in case used + */ +require_once(BASE_DIR."/lib/file_cache.php"); if(USE_MEMCACHE) { - $MEMCACHE = new Memcache(); + $CACHE = new Memcache(); foreach($MEMCACHES as $mc) { - $MEMCACHE->addServer($mc['host'], $mc['port']); + $CACHE->addServer($mc['host'], $mc['port']); } unset($mc); + define("USE_CACHE", true); +} else if (USE_FILECACHE) { + $CACHE = new FileCache(WORK_DIRECTORY."/cache/queries"); + define("USE_CACHE", true); +} else { + define("USE_CACHE", false); } mb_internal_encoding("UTF-8"); diff --git a/lib/phrase_parser.php b/lib/phrase_parser.php index 0c5ed1845..c752d9c09 100755 --- a/lib/phrase_parser.php +++ b/lib/phrase_parser.php @@ -49,7 +49,6 @@ require_once BASE_DIR."/lib/crawl_constants.php"; /** * Library of functions used to manipulate words and phrases * - * * @author Chris Pollett * * @package seek_quarry @@ -195,7 +194,8 @@ class PhraseParser if($stemmer != NULL) { - $stem = $stemmer::stem($pre_stem); + $stem_obj = new $stemmer(); //for php 5.2 compatibility + $stem = $stem_obj->stem($pre_stem); } else { $stem = $pre_stem; } diff --git a/lib/web_archive_bundle.php b/lib/web_archive_bundle.php index e01e3f45b..640c05b36 100755 --- a/lib/web_archive_bundle.php +++ b/lib/web_archive_bundle.php @@ -242,8 +242,10 @@ class WebArchiveBundle //this might not have been open yet $create_flag = false; $compressor = $this->compressor; + $compressor = $this->compressor; + $compressor_obj = new $compressor(); $archive_name = $this->dir_name."/web_archive_".$index - . $compressor::fileExtension(); + . $compressor_obj->fileExtension(); if(!file_exists($archive_name)) { $create_flag = true; } diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 50ecc685e..d27edad89 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/de/configure.ini b/locale/de/configure.ini index e5b18a11d..a963d3b9f 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 6d91dfc05..5af0ec3e4 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "Locale Deleted" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "Locale Strings Updated!" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "configs/config.php not web server writable." ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "Work directory needs to be writable by web server. " ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "php.ini directive post_max_size needs to be at least 16M" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "The following required items were missing: %s" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "The following optional items were missing: %s" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "Check Passed." ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "Using configs/local_config.php so changing work directory above may not work." ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "Please Name Your robot" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "Unable to Update config.php File!" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "Unable to Create Profile!" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "Problem Updating Database!" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "Profile Updated!" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "Please Describe Your Robot" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "Using Index: %s Size: %s pages/%s urls" ; search_controller.php line: 245 search_controller_no_index_set = "No Search Index Set For Use!" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "This cached version of %s was obtained by the Yioop crawler on %s." ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "Toggle Extracted Page Summary" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "Use Memcache:" ; configure_element.php line: 220 configure_element_memcache_servers = "Memcache Servers" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "Use Filecache:" +; +; configure_element.php line: 235 configure_element_crawl_robot = "Crawl Robot Set-up" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "Crawl Robot Name:" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "Robot Instance:" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "Robot Description" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "Submit" ; ; crawloptions_element.php line: 62 diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/locale/es/configure.ini b/locale/es/configure.ini index c4edd77b6..59d19562e 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 3d2ed024d..1a3136578 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 01cf093eb..984fd73ac 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index b53e75639..c94dfed52 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "Locale telah dihapus" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 7d8be1a3b..73c465b40 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index d41f9471a..b5bb492d1 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "ローケルを削除しました" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "ローケルストリングを編集しました" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "ボット名を入力してください。" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "config.phpファイルのできない。更新" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "プロフィールを作成できない。" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "ディータベースの更新ない" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "プロフィールの変更できました。" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "プロフィールの変更できない。" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "ロボットの説明してください。" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "％sのこのキャッシュされたバージョンは％sのウィオップから入手しました。" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "検索ロボット設定" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "ロボット名" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "ロボット説明" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "サブミット" ; ; crawloptions_element.php line: 62 diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index d11e6fa57..859eaa657 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "로케일을 삭제 하였습니다." ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "로케일 지정 문자열을 업데이트 하였습니다." ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다." ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "로봇 이름을 정해 주십시요." ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다." ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "config.php 파일을 업데이트 실패했습니다." ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "프로필을 생성할수 없습니다." ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "데이터베이스를 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "프로필을 업데이트 했습니다." ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "당신의 로봇을 기술해 주십시요." ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "현재 캐시 버젼 %s 은 Yioop 크롤 %s 에 의하여 얻어 졌습니다. " ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "크롤 로봇 설정" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "로봇 기술 " ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "크롤 로봇 이름:" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "제출 " ; ; crawloptions_element.php line: 62 diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 1976673d7..6e2f71168 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index dd500681c..dcd6c21ec 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 1417bd333..13742435e 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 363197809..d39157361 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index c92edef35..f5cdc8307 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "Xóa miền địa phương" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "Chuỗi Địa phương được cập nhật" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 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: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "Đặt tên cho rô bô của bạn" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "Thư mục làm việc và hồ sơ được tạo ra" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "Không thể cập nhật hồ sơ config.php" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "Không thể tạo hồ sơ" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "Hồ sơ được cập nhật" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "Có sự trở ngaị về việc cập nhật hồ sơ " ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "Diễn tả rô bô của bạn" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 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: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "Mô tả rô-bốt" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 0d6bbe0c6..49ca4b126 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -229,58 +229,58 @@ admin_controller_localename_deleted = "" ; admin_controller.php line: 1317 admin_controller_localestrings_updated = "" ; -; admin_controller.php line: 1371 +; admin_controller.php line: 1378 admin_controller_no_write_config_php = "" ; -; admin_controller.php line: 1376 +; admin_controller.php line: 1383 admin_controller_no_write_work_dir = "" ; -; admin_controller.php line: 1381 +; admin_controller.php line: 1388 admin_controller_post_size_small = "" ; -; admin_controller.php line: 1387 +; admin_controller.php line: 1394 admin_controller_missing_required = "" ; -; admin_controller.php line: 1403 +; admin_controller.php line: 1417 admin_controller_missing_optional = "" ; -; admin_controller.php line: 1408 +; admin_controller.php line: 1422 admin_controller_check_passed = "" ; -; admin_controller.php line: 1413 +; admin_controller.php line: 1427 admin_controller_using_local_config = "" ; -; admin_controller.php line: 1483 +; admin_controller.php line: 1497 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 1495 +; admin_controller.php line: 1509 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 1504 +; admin_controller.php line: 1518 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 1512 +; admin_controller.php line: 1526 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 1523 +; admin_controller.php line: 1537 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 1532 +; admin_controller.php line: 1546 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1543 +; admin_controller.php line: 1557 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 1619 +; admin_controller.php line: 1634 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 1633 +; admin_controller.php line: 1648 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 1647 +; admin_controller.php line: 1662 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 1683 +; admin_controller.php line: 1698 admin_controller_describe_robot = "" ; ; search_controller.php line: 119 @@ -295,10 +295,10 @@ search_controller_crawl_info = "" ; search_controller.php line: 245 search_controller_no_index_set = "" ; -; search_controller.php line: 477 +; search_controller.php line: 478 search_controller_cached_version = "" ; -; search_controller.php line: 491 +; search_controller.php line: 492 search_controller_summary_data = "" ; ; settings_controller.php line: 122 @@ -494,19 +494,22 @@ configure_element_use_memcache = "" ; configure_element.php line: 220 configure_element_memcache_servers = "" ; -; configure_element.php line: 229 +; configure_element.php line: 227 +configure_element_use_filecache = "" +; +; configure_element.php line: 235 configure_element_crawl_robot = "" ; -; configure_element.php line: 231 +; configure_element.php line: 237 configure_element_robot_name = "" ; -; configure_element.php line: 239 +; configure_element.php line: 245 configure_element_robot_instance = "" ; -; configure_element.php line: 246 +; configure_element.php line: 252 configure_element_robot_description = "" ; -; configure_element.php line: 255 +; configure_element.php line: 261 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/models/datasources/sqlite3_manager.php b/models/datasources/sqlite3_manager.php index 81c104ffa..b8c94264f 100644 --- a/models/datasources/sqlite3_manager.php +++ b/models/datasources/sqlite3_manager.php @@ -63,6 +63,13 @@ class Sqlite3Manager extends DatasourceManager * Filename of the Sqlite3 Database * @var string */ + var $dbname; + + /** + * Sqlite3 whether access to DB is through PDO object or SQLite3 object + * @var bool + */ + var $pdo_flag; /** {@inheritdoc} */ function __construct() @@ -72,6 +79,15 @@ class Sqlite3Manager extends DatasourceManager mkdir(CRAWL_DIR."/data"); chmod(CRAWL_DIR."/data", 0777); } + if(class_exists("SQLite3")) { + $this->pdo_flag = false; + } else if (class_exists("PDO") && + in_array("sqlite", PDO::getAvailableDrivers())) { + $this->pdo_flag = true; + } else { + echo "SQLite3 needs to be installed!"; + $this->pdo_flag = false; + } $this->dbname = NULL; } @@ -94,15 +110,22 @@ class Sqlite3Manager extends DatasourceManager } $this->dbname = $db_name; - $this->dbhandle = new SQLite3(CRAWL_DIR."/data/$db_name.db", - SQLITE3_OPEN_READWRITE |SQLITE3_OPEN_CREATE); + if(!$this->pdo_flag) { + $this->dbhandle = new SQLite3(CRAWL_DIR."/data/$db_name.db", + SQLITE3_OPEN_READWRITE |SQLITE3_OPEN_CREATE); + } else { + $this->dbhandle = new PDO("sqlite:". + CRAWL_DIR."/data/$db_name.db"); + } return $this->dbhandle; } /** {@inheritdoc} */ function disconnect() { - $this->dbhandle->close(); + if(!$this->pdo_flag) { + $this->dbhandle->close(); + } } /** {@inheritdoc} */ @@ -116,7 +139,11 @@ class Sqlite3Manager extends DatasourceManager /** {@inheritdoc} */ function affectedRows() { - return $this->dbhandle->changes(); + if(method_exists($this->dbhandle, "changes")) { + return $this->dbhandle->changes(); + } else { + echo "Affected rows not supported in PDO!"; + } } /** {@inheritdoc} */ @@ -128,15 +155,22 @@ class Sqlite3Manager extends DatasourceManager /** {@inheritdoc} */ function fetchArray($result) { - $row = $result->fetchArray(SQLITE3_ASSOC); - + if(!$this->pdo_flag) { + $row = $result->fetchArray(SQLITE3_ASSOC); + } else { + $row = $result->fetch(PDO::FETCH_ASSOC); + } return $row; } /** {@inheritdoc} */ function escapeString($str) { - return $this->dbhandle->escapeString($str); + if(method_exists($this->dbhandle, "escapeString")) { + return $this->dbhandle->escapeString($str); + } else { + return addslashes($str); + } } diff --git a/models/phrase_model.php b/models/phrase_model.php index 1ad9a2112..5c66ee223 100755 --- a/models/phrase_model.php +++ b/models/phrase_model.php @@ -48,6 +48,11 @@ require_once BASE_DIR."/lib/utility.php"; */ require_once BASE_DIR."/lib/index_archive_bundle.php"; +/** + * Load FileCache class in case used + */ +require_once(BASE_DIR."/lib/file_cache.php"); + /** * Load iterators to get docs out of index archive */ @@ -88,10 +93,10 @@ class PhraseModel extends Model var $query_info; /** - * Number of pages to cache in one go in memcache - * Size chosen based on 1MB max object size for memcache + * Number of pages to cache in one go in memcache or filecache + * Size chosen based on 1MB max object size for memcache or filecache */ - const NUM_CACHE_PAGES = 50; + const NUM_CACHE_PAGES = 10; /** * {@inheritdoc} */ @@ -628,7 +633,7 @@ class PhraseModel extends Model */ function getSummariesByHash($word_structs, $limit, $num) { - global $MEMCACHE; + global $CACHE; $pages = array(); $generation = 0; @@ -636,7 +641,7 @@ class PhraseModel extends Model self::NUM_CACHE_PAGES; $start_slice = floor(($limit)/self::NUM_CACHE_PAGES) * self::NUM_CACHE_PAGES; - if(USE_MEMCACHE) { + if(USE_CACHE) { $mem_tmp = ""; foreach($word_structs as $word_struct) { $mem_tmp .= serialize($word_struct["KEYS"]). @@ -651,7 +656,7 @@ class PhraseModel extends Model $results['PAGES'] = array(); for($i=$start_slice; $i< $to_retrieve; $i+=self::NUM_CACHE_PAGES){ $summary_hash = crawlHash($mem_tmp.":".$i); - $slice = $MEMCACHE->get($summary_hash); + $slice = $CACHE->get($summary_hash); if($slice === false) { $cache_success = false; break; @@ -699,7 +704,7 @@ class PhraseModel extends Model $result_count = count($pages); - if(USE_MEMCACHE) { + if(USE_CACHE) { for($i = 0; $i < $result_count; $i++){ unset($pages[$i][self::LINKS]); } @@ -708,7 +713,7 @@ class PhraseModel extends Model $slice['PAGES'] = array_slice($pages, $i, self::NUM_CACHE_PAGES); $slice['TOTAL_ROWS'] = $results['TOTAL_ROWS']; - $MEMCACHE->set($summary_hash, $slice); + $CACHE->set($summary_hash, $slice); } } diff --git a/models/profile_model.php b/models/profile_model.php index 426b9f47c..d37c1e5b3 100644 --- a/models/profile_model.php +++ b/models/profile_model.php @@ -53,7 +53,7 @@ class ProfileModel extends Model 'DEFAULT_LOCALE', 'DEBUG_LEVEL', 'DBMS','DB_URL', 'DB_NAME', 'DB_USER', 'DB_PASSWORD', 'QUEUE_SERVER', 'AUTH_KEY', "ROBOT_DESCRIPTION", 'WEB_URI', - 'USE_MEMCACHE', 'MEMCACHE_SERVERS', 'CACHE_LINK', + 'USE_MEMCACHE', 'MEMCACHE_SERVERS', 'USE_FILECACHE', 'CACHE_LINK', 'SIMILAR_LINK', 'IN_LINK', 'IP_LINK', 'SIGNIN_LINK', 'ROBOT_INSTANCE'); /** diff --git a/views/elements/configure_element.php b/views/elements/configure_element.php index c8b85b178..3c6ee713f 100644 --- a/views/elements/configure_element.php +++ b/views/elements/configure_element.php @@ -224,6 +224,12 @@ class ConfigureElement extends Element name="MEMCACHE_SERVERS"><?php e($data['MEMCACHE_SERVERS']); ?></textarea> </div> + <div class="topmargin"><label for="use-filecache"><b><?php + e(tl('configure_element_use_filecache'))?></b></label> + <input type="checkbox" id="use-filecache" + name="USE_FILECACHE" value="true" <?php + e($data['USE_FILECACHE'] ? "checked='checked'" : + "" ); ?> /></div> </fieldset> </div> <div class="topmargin"><fieldset><legend><?php