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

- Bugfix: fixed searches to do boolean AND rather than OR. This isn't the best way to do things, but seems to be pretty much the only way to get things to be properly 

ANSI-compliant.  Patch by #17 by Al.  (Note: I haven't really tested this fix but this should fix bug #1857.)
4.2.x
Dries Buytaert 2003-06-16 17:20:50 +00:00
parent c409368062
commit 026c09b6ce
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/search.module
View File

@ -129,6 +129,9 @@ function do_search($search_array) {
$name = $row["name"];
$count = $row["count"];
// Build reduction variable
$reduction[$lno][$word] = true;
// If the just fetched row is not already in the table
if ($results[$lno]["lno"] != $lno) {
$results[$lno]["count"] = $count;
@ -152,6 +155,23 @@ function do_search($search_array) {
}
}
if ($found) {
foreach ($results as $lno => $values) {
$pass = true;
foreach ($words as $word) {
if (!$reduction[$lno][$word]) {
$pass = false;
}
}
if ($pass) {
$fullresults[$lno] = $values;
}
}
$results = $fullresults;
if (!is_array($results)) {
$found = 0;
}
}
if ($found) {
// Black magic here to sort the results
array_multisort($results, SORT_DESC);

20
modules/search/search.module
View File

@ -129,6 +129,9 @@ function do_search($search_array) {
$name = $row["name"];
$count = $row["count"];
// Build reduction variable
$reduction[$lno][$word] = true;
// If the just fetched row is not already in the table
if ($results[$lno]["lno"] != $lno) {
$results[$lno]["count"] = $count;
@ -152,6 +155,23 @@ function do_search($search_array) {
}
}
if ($found) {
foreach ($results as $lno => $values) {
$pass = true;
foreach ($words as $word) {
if (!$reduction[$lno][$word]) {
$pass = false;
}
}
if ($pass) {
$fullresults[$lno] = $values;
}
}
$results = $fullresults;
if (!is_array($results)) {
$found = 0;
}
}
if ($found) {
// Black magic here to sort the results
array_multisort($results, SORT_DESC);