[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35089] branches/7.x/lib/core/Search/Index/Lucene.php

[<lph...@us...>]

Revision: 35089
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35089&view=rev
Author:   lphuberdeau
Date:     2011-06-28 20:06:24 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
[FIX] Also needed to be applied to highlight and invalidation

Modified Paths:
--------------
    branches/7.x/lib/core/Search/Index/Lucene.php

Modified: branches/7.x/lib/core/Search/Index/Lucene.php
===================================================================
--- branches/7.x/lib/core/Search/Index/Lucene.php	2011-06-28 20:01:39 UTC (rev 35088)
+++ branches/7.x/lib/core/Search/Index/Lucene.php	2011-06-28 20:06:24 UTC (rev 35089)
@@ -62,7 +62,6 @@
 	function find(Search_Expr_Interface $query, Search_Query_Order $sortOrder, $resultStart, $resultCount)
 	{
 		$query = $this->buildQuery($query);
-		$query = Zend_Search_Lucene_Search_QueryParser::parse($query, 'UTF-8');
 
 		$hits = $this->lucene->find($query, $this->getSortField($sortOrder), $this->getSortType($sortOrder), $this->getSortOrder($sortOrder));
 		$result = array();
@@ -150,7 +149,8 @@
 
 	private function buildQuery($expr)
 	{
-		return (string) $expr->walk(array($this, 'walkCallback'));
+		$query = (string) $expr->walk(array($this, 'walkCallback'));
+		return Zend_Search_Lucene_Search_QueryParser::parse($query, 'UTF-8');
 	}
 
 	function walkCallback($node, $childNodes)
@@ -242,7 +242,7 @@
 
 	function __construct($query)
 	{
-		$this->query = Zend_Search_Lucene_Search_QueryParser::parse($query);
+		$this->query = Zend_Search_Lucene_Search_QueryParser::parse($query, 'UTF-8');
 	}
 
 	function filter($content)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.