Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fixing duplicate rows error during indexing 

- Fixing broken "pagerank" detection
4.6.x
Steven Wittens 2005-01-11 03:37:13 +00:00
parent 59a2c464c7
commit 854fa41fb3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/search.module
View File

@ -181,7 +181,11 @@ function search_cron() {
$total = db_result(db_query("SELECT SUM(score) FROM {search_index} WHERE word = '%s'", $word));
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);
// Note: affected rows does not count matching rows that already had the right value!
$exists = db_result(db_query("SELECT COUNT(*) FROM {search_total} WHERE word = '%s'", $word));
if (!$exists) {
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
@ -331,7 +335,7 @@ function search_index($sid, $type, $text) {
// Check if link points to a node on this site
if (preg_match($node_regexp, $value, $match)) {
$path = drupal_get_normal_path($match[1]);
if (preg_match('!(node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
$linknid = $match[1];
if ($linknid > 0) {
$link = true;

8
modules/search/search.module
View File

@ -181,7 +181,11 @@ function search_cron() {
$total = db_result(db_query("SELECT SUM(score) FROM {search_index} WHERE word = '%s'", $word));
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);
// Note: affected rows does not count matching rows that already had the right value!
$exists = db_result(db_query("SELECT COUNT(*) FROM {search_total} WHERE word = '%s'", $word));
if (!$exists) {
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
@ -331,7 +335,7 @@ function search_index($sid, $type, $text) {
// Check if link points to a node on this site
if (preg_match($node_regexp, $value, $match)) {
$path = drupal_get_normal_path($match[1]);
if (preg_match('!(node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
$linknid = $match[1];
if ($linknid > 0) {
$link = true;