Merged in from DEV trunk...

KTS-2400 "Using double quotes in the new search system may be problematic" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8025 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-2400 "Using double quotes in the new search system may be problematic" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8025 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent f7a2e871
Showing 5 changed files with 46 additions and 19 deletions
search2/search/SearchCommandLexer.php
search2/search/expr.inc.php
thirdparty/pear/GraphViz.php
thirdparty/pear/HTTP/Upload.php
thirdparty/pear/Net/Ping.php
@@ -95,6 +95,9 @@ class SearchCommandLexer
                 $append=false;
                 $clear=true;
                 break;
+            case '~':
+            	$this->token=SearchCommandParser::TILDE;
+                break;
             case '=':
                 $this->token=SearchCommandParser::IS;
                 break;
@@ -136,8 +139,8 @@ class SearchCommandLexer
                 }
                 elseif ($this->lookahead == '=')
                 {
-                    $this->zap();
                     $this->token=($this->char == '<')?(SearchCommandParser::LE):(SearchCommandParser::GE);
+                    $this->zap();
                 }
                 else
                 {
@@ -223,6 +226,9 @@ class SearchCommandLexer
         {
             switch($this->char)
             {
+            	case '"':
+                    $this->value .= '"';
+                    break;
                 case 'r':
                     $this->value .= "\r";
                     break;
@@ -390,13 +390,14 @@ class FieldExpr extends Expr
 			$value = $right;
 		}
-		if (substr($value,0,1) != '\'' || substr($value,-1) != '\'')
+		if ((substr($value,0,1) == '\'' && substr($value,-1) == '\'') || (substr($value,0,1) == '"' && substr($value,-1) == '"'))
 		{
-			OpExpr::rewriteString($left, $op, $right, $not);
+			$value =  trim( substr($value,1,-1) );
+			$right = new ValueExpr($value);
 		}
 		else
 		{
-			$right = new ValueExpr(trim(substr($value,1,-1)));
+			OpExpr::rewriteString($left, $op, $right, $not);
 		}
     }
 }
@@ -541,19 +542,26 @@ class ValueExpr extends Expr
      */
     protected $value;
+    protected $fuzzy;
+
+    protected $proximity;
+
     /**
      * Constructor for the value expression
      *
      * @param mixed $value
      */
-    public function __construct($value)
+    public function __construct($value, $fuzzy=null, $proximity=null)
     {
         parent::__construct();
         $this->value=$value;
+        $this->fuzzy = $fuzzy;
+        $this->proximity = $proximity;
     }
     public function getValue()
     {
+
         return $this->value;
     }
@@ -851,7 +859,14 @@ class TextQueryBuilder implements QueryBuilder
             $not = $expr->not()?' NOT ':'';
-			$query = "$not$fieldname: \"$value\"";
+            if (strpos($value, ' ') === false)
+            {
+            	$query = "$not$fieldname: $value";
+            }
+            else
+            {
+            	$query = "$not$fieldname: \"$value\"";
+            }
 		}
 		return $query;
@@ -875,7 +890,10 @@ class TextQueryBuilder implements QueryBuilder
             $not = $expr->not()?' NOT ':'';
-			$query .= "$not$fieldname: \"$value\"";
+            if (strpos($value, ' ') !== false)
+				$query .= "$not$fieldname: \"$value\"";
+			else
+				$query .= "$not$fieldname: $value";
 		}
 		return $query;
@@ -1931,7 +1949,8 @@ class OpExpr extends Expr
     	$results = array();
-    	if ($this->debug) print "\n\n$sql\n\n";
+    	global $default;
+    	$default->log->debug("SEARCH SQL: $sql");
     	$rs = DBUtil::getResultArray($sql);
     	if (PEAR::isError($rs))
@@ -1969,7 +1988,9 @@ class OpExpr extends Expr
     	}
     	$indexer = Indexer::get();
-    	if ($this->debug) print "\n\n$query\n\n";
+    	global $default;
+    	$default->log->debug("SEARCH LUCENE: $query");
+
     	$results = $indexer->query($query);
     	foreach($results as $item)
     	{
@@ -4,7 +4,7 @@
 /**
  * Image_GraphViz
  *
- * Copyright (c) 2001-2006, Dr. Volker Göbbels <vmg@arachnion.de> and
+ * Copyright (c) 2001-2006, Dr. Volker Gï¿½bbels <vmg@arachnion.de> and
  * Sebastian Bergmann <sb@sebastian-bergmann.de>. All rights reserved.
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
@@ -15,7 +15,7 @@
  *
  * @category   Image
  * @package    GraphViz
- * @author     Dr. Volker Göbbels <vmg@arachnion.de>
+ * @author     Dr. Volker Gï¿½bbels <vmg@arachnion.de>
  * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
  * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
  * @author     Michael Lively Jr. <mlively@ft11.net>
@@ -90,10 +90,10 @@ require_once &#39;System.php&#39;;
  * @category  Image
  * @package   GraphViz
  * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @author    Dr. Volker Göbbels <vmg@arachnion.de>
+ * @author    Dr. Volker Gï¿½bbels <vmg@arachnion.de>
  * @author    Karsten Dambekalns <k.dambekalns@fishfarm.de>
  * @author    Michael Lively Jr. <mlively@ft11.net>
- * @copyright Copyright &copy; 2001-2006 Dr. Volker Göbbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright Copyright &copy; 2001-2006 Dr. Volker Gï¿½bbels <vmg@arachnion.de> and Sebastian Bergmann <sb@sebastian-bergmann.de>
  * @license   http://www.php.net/license/3_0.txt The PHP License, Version 3.0
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/Image_GraphViz
@@ -205,7 +205,7 @@ class HTTP_Upload_Error extends PEAR
                 'en'    => 'The file was only partially uploaded.',
                 'de'    => 'Die Datei wurde unvollst&auml;ndig &uuml;bertragen.',
                 'nl'    => 'Het bestand is slechts gedeeltelijk geupload.',
-                'pt_BR' => 'O arquivo não foi enviado por completo.'
+                'pt_BR' => 'O arquivo nï¿½o foi enviado por completo.'
                 ),
             'ERROR' => array(
                 'es'    => 'Error en subida:',
@@ -215,7 +215,7 @@ class HTTP_Upload_Error extends PEAR
                 'pt_BR' => 'Erro de upload:'
                 ),
             'DEV_NO_DEF_FILE' => array(
-                'es'    => 'No está definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
+                'es'    => 'No estï¿½ definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
                 'en'    => 'This filename is not defined in the form as &lt;input type="file" name=?&gt;.',
                 'de'    => 'Dieser Dateiname ist im Formular nicht als &lt;input type="file" name=?&gt; definiert.',
                 'nl'    => 'Deze bestandsnaam is niett gedefineerd in het formulier als &lt;input type="file" name=?&gt;.'
@@ -660,7 +660,7 @@ class HTTP_Upload_File extends HTTP_Upload_Error
      */
     function nameToSafe($name, $maxlen=250)
     {
-        $noalpha = 'ÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÀÈÌÒÙàèìòùÄËÏÖÜäëïöüÿÃãÕõÅåÑñÇç@°ºª';
+        $noalpha = 'ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½@ï¿½ï¿½ï¿½';
         $alpha   = 'AEIOUYaeiouyAEIOUaeiouAEIOUaeiouAEIOUaeiouyAaOoAaNnCcaooa';
         $name = substr($name, 0, $maxlen);
@@ -16,7 +16,7 @@
 // | Authors: Martin Jansen <mj@php.net>                                  |
 // |          Tomas V.V.Cox <cox@idecnet.com>                             |
 // |          Jan Lehnardt  <jan@php.net>                                 |
-// |          Kai Schröder <k.schroeder@php.net>                          |
+// |          Kai Schrï¿½der <k.schroeder@php.net>                          |
 // +----------------------------------------------------------------------+
 //
 // $Id$
@@ -408,7 +408,7 @@ class Net_Ping
     * @param mixed $error a PEAR error or a string with the error message
     * @return bool false
     * @access private
-    * @author Kai Schröder <k.schroeder@php.net>
+    * @author Kai Schrï¿½der <k.schroeder@php.net>
     */
     function _raiseError($error)
     {
@@ -864,7 +864,7 @@ class Net_Ping_Result
     /**
     * Parses the output of Windows' ping command
     *
-    * @author Kai Schröder <k.schroeder@php.net>
+    * @author Kai Schrï¿½der <k.schroeder@php.net>
     * @access private
     */
     function _parseResultwindows()