? boost-337391.patch ? boost-551014.patch Index: boost.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.admin.inc,v retrieving revision 1.1.2.1.2.3.2.55 diff -u -p -r1.1.2.1.2.3.2.55 boost.admin.inc --- boost.admin.inc 19 Aug 2009 20:58:48 -0000 1.1.2.1.2.3.2.55 +++ boost.admin.inc 19 Aug 2009 21:34:17 -0000 @@ -56,12 +56,14 @@ function boost_admin_performance_page($f '#options' => $period, '#description' => t('The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs.'), ); - $form['boost']['boost_push_html'] = array( - '#type' => 'checkbox', - '#title' => t('Preemptive Cache HTML'), - '#default_value' => BOOST_PUSH_HTML, - '#description' => t('Crawl Site after cron runs, so the cache is primed.'), - ); + if (BOOST_CRAWL_ON_CRON) { + $form['boost']['boost_push_html'] = array( + '#type' => 'checkbox', + '#title' => t('Preemptive Cache HTML'), + '#default_value' => BOOST_PUSH_HTML, + '#description' => t('Crawl Site after cron runs, so the cache is primed.'), + ); + } } if (BOOST_CACHE_XML) { $form['boost']['boost_cache_xml_lifetime'] = array( @@ -71,12 +73,14 @@ function boost_admin_performance_page($f '#options' => $period, '#description' => t('The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs.'), ); - $form['boost']['boost_push_xml'] = array( - '#type' => 'checkbox', - '#title' => t('Preemptive Cache XML'), - '#default_value' => BOOST_PUSH_XML, - '#description' => t('Crawl Site after cron runs, so the cache is primed.'), - ); + if (BOOST_CRAWL_ON_CRON) { + $form['boost']['boost_push_xml'] = array( + '#type' => 'checkbox', + '#title' => t('Preemptive Cache XML'), + '#default_value' => BOOST_PUSH_XML, + '#description' => t('Crawl Site after cron runs, so the cache is primed.'), + ); + } } if (BOOST_CACHE_JSON) { $form['boost']['boost_cache_json_lifetime'] = array( @@ -86,12 +90,14 @@ function boost_admin_performance_page($f '#options' => $period, '#description' => t('The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied. Cache lifetime gets checked on cron runs.'), ); - $form['boost']['boost_push_json'] = array( - '#type' => 'checkbox', - '#title' => t('Preemptive Cache AJAX/JSON'), - '#default_value' => BOOST_PUSH_JSON, - '#description' => t('Crawl Site after cron runs, so the cache is primed.'), - ); + if (BOOST_CRAWL_ON_CRON) { + $form['boost']['boost_push_json'] = array( + '#type' => 'checkbox', + '#title' => t('Preemptive Cache AJAX/JSON'), + '#default_value' => BOOST_PUSH_JSON, + '#description' => t('Crawl Site after cron runs, so the cache is primed.'), + ); + } } $form['boost']['boost_clear'] = array( '#type' => 'submit', @@ -337,6 +343,14 @@ function boost_admin_boost_performance_p '#default_value' => BOOST_CRAWL_ON_CRON, '#description' => t('Touch some select URL\'s so they are cached before anyone accesses them.'), ); + if (BOOST_CRAWL_ON_CRON) { + $form['advanced']['boost_crawl_url_alias'] = array( + '#type' => 'checkbox', + '#title' => t('Crawl All URL\'s in the url_alias table'), + '#default_value' => BOOST_CRAWL_URL_ALIAS, + '#description' => t('Preemptively cache all urls found in the url_alias table. This will crawl that page even if it is not expired. Enable & run cron to get the boost cache loaded.'), + ); + } $form['advanced']['boost_permissions_file'] = array( '#type' => 'textfield', '#title' => t('Files: Enter in a 4 digit number (octal) that will be used by !link. Example 0664', array('!link' => l(t('chmod()'), 'http://php.net/chmod'))), Index: boost.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/boost/boost.module,v retrieving revision 1.3.2.2.2.5.2.104 diff -u -p -r1.3.2.2.2.5.2.104 boost.module --- boost.module 19 Aug 2009 21:07:45 -0000 1.3.2.2.2.5.2.104 +++ boost.module 19 Aug 2009 21:34:17 -0000 @@ -54,7 +54,7 @@ define('BOOST_PUSH_JSON', var define('BOOST_CHAR', '_'); define('BOOST_MAX_TIMESTAMP', variable_get('boost_max_timestamp', BOOST_TIME)); define('BOOST_CHECK_BEFORE_CRON_EXPIRE', variable_get('boost_check_before_cron_expire', FALSE)); - +define('BOOST_CRAWL_URL_ALIAS', variable_get('boost_crawl_url_alias', FALSE)); // This cookie is set for all authenticated users, so that they can be // excluded from caching (or in the future get a user-specific cached page): @@ -2292,6 +2292,9 @@ function boost_crawler_seed_tables() { function boost_crawler_add_alias_to_table() { // Insert batch of html URL's into boost_crawler table global $base_url; + if (!variable_get('boost_crawl_url_alias', FALSE)) { + return TRUE; + } $count = 1000; $total = db_query("SELECT COUNT(*) FROM {url_alias}"); $loaded = variable_get('boost_crawler_loaded_count_alias', 0);