From e6b97c8c84b43251055d8229aed6418c50e2231a Mon Sep 17 00:00:00 2001
From: Conrad Vermeulen <conrad@knowledgetree.com>
Date: Thu, 8 May 2008 12:01:57 +0000
Subject: [PATCH] KTS-3329 "Boolean expression break simple search" Fixed

---
 search2/search/expr.inc.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/search2/search/expr.inc.php b/search2/search/expr.inc.php
index c91491d..c6a972b 100755
--- a/search2/search/expr.inc.php
+++ b/search2/search/expr.inc.php
@@ -6,31 +6,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -558,7 +558,13 @@ class ValueExpr extends Expr
     public function __construct($value, $fuzzy=null, $proximity=null)
     {
         parent::__construct();
-        $this->value=$value;
+
+        // some keywords are used by lucene, and may conflict. for some reason, if it is lowercase, the problem does not occur.
+        if (in_array($value, array('AND','OR','NOT')))
+        {
+            $value = strtolower($value);
+        }
+        $this->value= $value;
         $this->fuzzy = $fuzzy;
         $this->proximity = $proximity;
     }
--
libgit2 0.21.4