From bd6ae69345dd6450e8480a647daae3c323cff095 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 3 Nov 2004 16:46:58 +0000
Subject: [PATCH] - Patch by Steven: + Display 'friendly' name rather than
module name in search watchdog messages. + Remove left-over from
search_total table. + Add index wipe button to the admin + Moved the
admin to admin/settings/search + Prevented menu bug when node modules
update the breadcrumb in view (thanks JonBob). + Changed search_total
table's word key to PRIMARY.
---
database/database.mysql | 2 +-
database/updates.inc | 2 +-
modules/node.module | 5 +++-
modules/node/node.module | 5 +++-
modules/search.module | 46 +++++++++++++++++++++++++++++-------
modules/search/search.module | 46 +++++++++++++++++++++++++++++-------
6 files changed, 84 insertions(+), 22 deletions(-)
diff --git a/database/database.mysql b/database/database.mysql
index 884aa8b358f6..026a20292d14 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -551,7 +551,7 @@ CREATE TABLE search_index (
CREATE TABLE search_total (
word varchar(50) NOT NULL default '',
count int(10) unsigned default NULL,
- KEY word (word)
+ PRIMARY KEY word (word)
) TYPE=MyISAM;
--
diff --git a/database/updates.inc b/database/updates.inc
index 444487244927..ac7ad621dcbe 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1946,7 +1946,7 @@ function update_110() {
$ret[] = update_sql("CREATE TABLE {search_total} (
word varchar(50) NOT NULL default '',
count int(10) unsigned default NULL,
- KEY word (word)
+ PRIMARY KEY word (word)
) TYPE=MyISAM");
$ret[] = update_sql("DELETE FROM {variable} WHERE name = 'node_cron_last'");
diff --git a/modules/node.module b/modules/node.module
index 9523efee2079..501272ae2f2f 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -558,6 +558,9 @@ function node_search($op = 'search', $keys = null) {
switch ($op) {
case 'name':
return t('content');
+ case 'reset':
+ variable_del('node_cron_last');
+ return;
case 'search':
$find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. node_access_join_sql() .' INNER JOIN {users} u ON n.uid = u.uid', 'n.status = 1 AND '. node_access_where_sql());
$results = array();
@@ -1524,7 +1527,7 @@ function node_update_index() {
variable_set('node_cron_last', max($node->changed, $node->created));
if (node_hook($node, 'view')) {
- node_invoke($node, 'view', false, true);
+ node_invoke($node, 'view', false, false);
}
else {
$node = node_prepare($node, false);
diff --git a/modules/node/node.module b/modules/node/node.module
index 9523efee2079..501272ae2f2f 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -558,6 +558,9 @@ function node_search($op = 'search', $keys = null) {
switch ($op) {
case 'name':
return t('content');
+ case 'reset':
+ variable_del('node_cron_last');
+ return;
case 'search':
$find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. node_access_join_sql() .' INNER JOIN {users} u ON n.uid = u.uid', 'n.status = 1 AND '. node_access_where_sql());
$results = array();
@@ -1524,7 +1527,7 @@ function node_update_index() {
variable_set('node_cron_last', max($node->changed, $node->created));
if (node_hook($node, 'view')) {
- node_invoke($node, 'view', false, true);
+ node_invoke($node, 'view', false, false);
}
else {
$node = node_prepare($node, false);
diff --git a/modules/search.module b/modules/search.module
index 0245644ccae9..1c91be379972 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -48,7 +48,7 @@ function search_help($section = 'admin/help#search') {
case 'admin/modules#description':
return t('Enables site-wide keyword searching.');
case 'admin/search':
- return t('The search engine works by maintaining an index of words in your content. You can adjust the settings below to tweak the indexing behaviour. Note that indexing requires cron to be set up correctly.');
+ return t('<p>The search engine works by maintaining an index of words in your site\'s content. You can adjust the settings below to tweak the indexing behaviour. Note that indexing requires cron to be set up correctly.</p><p>Changes to these settings will only apply to content that is indexed after the change. If you want them to apply to everything, you need to wipe the index with the button below.</p>');
case 'search#noresults':
return t('<p><ul>
<li>Check if your spelling is correct.</li>
@@ -95,7 +95,7 @@ function search_menu($may_cache) {
'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'search/search', 'title' => t('search'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
- $items[] = array('path' => 'admin/search', 'title' => t('search'),
+ $items[] = array('path' => 'admin/settings/search', 'title' => t('search'),
'callback' => 'search_admin',
'access' => user_access('administer site configuration'));
}
@@ -110,6 +110,9 @@ function search_admin() {
if ($_POST) {
system_settings_save();
}
+ if ($_POST['op'] == t('Wipe index')) {
+ search_wipe();
+ }
// Indexing settings:
$group = form_textfield(t('Minimum word length to index'), 'minimum_word_size', variable_get('minimum_word_size', 3), 3, 3, t('The number of characters a word has to be to be indexed. Words shorter than this will not be searchable.'));
@@ -120,14 +123,27 @@ function search_admin() {
// Collect some stats
$estimate = db_result(db_query('SELECT COUNT(DISTINCT sid) FROM {search_index}'));
- $nodes = db_result(db_query('SELECT COUNT(*) FROM {node}'));
+ $nodes = max(1, db_result(db_query('SELECT COUNT(*) FROM {node}')));
$percentage = ((int)min(100, 100 * $estimate / $nodes)) . '%';
- $status = '<p>'. t('Approximately %percentage of the site has been indexed.', array('%percentage' => $percentage));
+ $status = '<p>'. t('Approximately %percentage of the site has been indexed.', array('%percentage' => $percentage)) .'</p>';
+ $status .= '<p>'. form_button(t('Wipe index')) . '</p>';
$output .= form_group('Indexing status', $status);
print theme('page', system_settings_form($output));
}
+/**
+ * Wipe the search index.
+ */
+function search_wipe() {
+ db_query('DELETE FROM {search_index}');
+ db_query('DELETE FROM {search_total}');
+ module_invoke_all('search', 'reset');
+
+ drupal_set_message(t('The search index has been wiped.'));
+ drupal_goto('admin/settings/search');
+}
+
/**
* Marks a word as dirty (or retrieves the list of dirty words). This is used
* during indexing (cron). Words which are dirty have outdated total counts in
@@ -150,15 +166,24 @@ function search_dirty($word = null) {
* search_dirty).
*/
function search_cron() {
- /* Update word index */
+ // Update word index
foreach (module_list() as $module) {
module_invoke($module, 'update_index');
}
- /* Update word counts for new/changed words */
+ // Update word counts for new/changed words
foreach (search_dirty() as $word => $dummy) {
- db_query("DELETE FROM {search_total} WHERE word = '%s'", $word);
$total = db_result(db_query("SELECT SUM(score) FROM {search_index} WHERE word = '%s'", $word));
- db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %d)", $word, $total);
+ db_query("UPDATE {search_total} SET count = %d WHERE word = '%s'", $total, $word);
+ if (!db_affected_rows()) {
+ db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %d)", $word, $total);
+ }
+ }
+ // Find words that were deleted from search_index, but are still in
+ // search_total. We use a LEFT JOIN between the two tables and keep only the
+ // rows which fail to join.
+ $result = db_query("SELECT t.word AS realword, i.word FROM {search_total} t LEFT JOIN {search_index} i ON t.word = i.word WHERE i.word IS NULL");
+ while ($word = db_fetch_object($result)) {
+ db_query("DELETE FROM {search_total} WHERE word = '%s'", $word->realword);
}
}
@@ -445,7 +470,10 @@ function search_view() {
// Only perform search if there is non-whitespace search term:
if (trim($keys)) {
// Log the search keys:
- watchdog('search', t('Search: %keys (%type).', array('%keys' => "<em>$keys</em>", '%type' => $type)), l(t('results'), 'search', NULL, 'keys='. urlencode($keys) . '&type='. urlencode($type)));
+ watchdog('search',
+ t('Search: %keys (%type).', array('%keys' => "<em>$keys</em>", '%type' => module_invoke($type, 'search', 'name'))),
+ l(t('results'), 'search', NULL, 'keys='. urlencode($keys) . '&type='. urlencode($type))
+ );
// Collect the search results:
$results = search_data($keys, $type);
diff --git a/modules/search/search.module b/modules/search/search.module
index 0245644ccae9..1c91be379972 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -48,7 +48,7 @@ function search_help($section = 'admin/help#search') {
case 'admin/modules#description':
return t('Enables site-wide keyword searching.');
case 'admin/search':
- return t('The search engine works by maintaining an index of words in your content. You can adjust the settings below to tweak the indexing behaviour. Note that indexing requires cron to be set up correctly.');
+ return t('<p>The search engine works by maintaining an index of words in your site\'s content. You can adjust the settings below to tweak the indexing behaviour. Note that indexing requires cron to be set up correctly.</p><p>Changes to these settings will only apply to content that is indexed after the change. If you want them to apply to everything, you need to wipe the index with the button below.</p>');
case 'search#noresults':
return t('<p><ul>
<li>Check if your spelling is correct.</li>
@@ -95,7 +95,7 @@ function search_menu($may_cache) {
'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'search/search', 'title' => t('search'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
- $items[] = array('path' => 'admin/search', 'title' => t('search'),
+ $items[] = array('path' => 'admin/settings/search', 'title' => t('search'),
'callback' => 'search_admin',
'access' => user_access('administer site configuration'));
}
@@ -110,6 +110,9 @@ function search_admin() {
if ($_POST) {
system_settings_save();
}
+ if ($_POST['op'] == t('Wipe index')) {
+ search_wipe();
+ }
// Indexing settings:
$group = form_textfield(t('Minimum word length to index'), 'minimum_word_size', variable_get('minimum_word_size', 3), 3, 3, t('The number of characters a word has to be to be indexed. Words shorter than this will not be searchable.'));
@@ -120,14 +123,27 @@ function search_admin() {
// Collect some stats
$estimate = db_result(db_query('SELECT COUNT(DISTINCT sid) FROM {search_index}'));
- $nodes = db_result(db_query('SELECT COUNT(*) FROM {node}'));
+ $nodes = max(1, db_result(db_query('SELECT COUNT(*) FROM {node}')));
$percentage = ((int)min(100, 100 * $estimate / $nodes)) . '%';
- $status = '<p>'. t('Approximately %percentage of the site has been indexed.', array('%percentage' => $percentage));
+ $status = '<p>'. t('Approximately %percentage of the site has been indexed.', array('%percentage' => $percentage)) .'</p>';
+ $status .= '<p>'. form_button(t('Wipe index')) . '</p>';
$output .= form_group('Indexing status', $status);
print theme('page', system_settings_form($output));
}
+/**
+ * Wipe the search index.
+ */
+function search_wipe() {
+ db_query('DELETE FROM {search_index}');
+ db_query('DELETE FROM {search_total}');
+ module_invoke_all('search', 'reset');
+
+ drupal_set_message(t('The search index has been wiped.'));
+ drupal_goto('admin/settings/search');
+}
+
/**
* Marks a word as dirty (or retrieves the list of dirty words). This is used
* during indexing (cron). Words which are dirty have outdated total counts in
@@ -150,15 +166,24 @@ function search_dirty($word = null) {
* search_dirty).
*/
function search_cron() {
- /* Update word index */
+ // Update word index
foreach (module_list() as $module) {
module_invoke($module, 'update_index');
}
- /* Update word counts for new/changed words */
+ // Update word counts for new/changed words
foreach (search_dirty() as $word => $dummy) {
- db_query("DELETE FROM {search_total} WHERE word = '%s'", $word);
$total = db_result(db_query("SELECT SUM(score) FROM {search_index} WHERE word = '%s'", $word));
- db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %d)", $word, $total);
+ db_query("UPDATE {search_total} SET count = %d WHERE word = '%s'", $total, $word);
+ if (!db_affected_rows()) {
+ db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %d)", $word, $total);
+ }
+ }
+ // Find words that were deleted from search_index, but are still in
+ // search_total. We use a LEFT JOIN between the two tables and keep only the
+ // rows which fail to join.
+ $result = db_query("SELECT t.word AS realword, i.word FROM {search_total} t LEFT JOIN {search_index} i ON t.word = i.word WHERE i.word IS NULL");
+ while ($word = db_fetch_object($result)) {
+ db_query("DELETE FROM {search_total} WHERE word = '%s'", $word->realword);
}
}
@@ -445,7 +470,10 @@ function search_view() {
// Only perform search if there is non-whitespace search term:
if (trim($keys)) {
// Log the search keys:
- watchdog('search', t('Search: %keys (%type).', array('%keys' => "<em>$keys</em>", '%type' => $type)), l(t('results'), 'search', NULL, 'keys='. urlencode($keys) . '&type='. urlencode($type)));
+ watchdog('search',
+ t('Search: %keys (%type).', array('%keys' => "<em>$keys</em>", '%type' => module_invoke($type, 'search', 'name'))),
+ l(t('results'), 'search', NULL, 'keys='. urlencode($keys) . '&type='. urlencode($type))
+ );
// Collect the search results:
$results = search_data($keys, $type);
--
GitLab