Commit ad0d715fcb3fa54d151ae5719079c19439fff27d
1 parent
0392b66e
KTS-673
"The search algorithm needs some work" Updated. When quotes are detected in a text search, the subexpressions where OR'd. They should be ANDed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7249 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
2 additions
and
2 deletions
search2/search/expr.inc.php
| @@ -1540,11 +1540,11 @@ class OpExpr extends Expr | @@ -1540,11 +1540,11 @@ class OpExpr extends Expr | ||
| 1540 | else | 1540 | else |
| 1541 | { | 1541 | { |
| 1542 | $join = new OpExpr($doctext, $op, new ValueExpr($text[$i])); | 1542 | $join = new OpExpr($doctext, $op, new ValueExpr($text[$i])); |
| 1543 | - $right = new OpExpr($join, ExprOp::OP_OR, $right); | 1543 | + $right = new OpExpr($join, ExprOp::OP_AND, $right); |
| 1544 | } | 1544 | } |
| 1545 | } | 1545 | } |
| 1546 | 1546 | ||
| 1547 | - $op = ExprOp::OP_OR; | 1547 | + $op = ExprOp::OP_AND; |
| 1548 | } | 1548 | } |
| 1549 | 1549 | ||
| 1550 | 1550 |