Lucene upgrade to 2.4.1: MOB-587: First round of fixes for the query parser

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2009-03-16 12:08:04 +00:00
parent a966e847f0
commit 02171f6699
9 changed files with 22 additions and 21 deletions

View File

@@ -35,7 +35,7 @@ import javax.faces.context.ResponseWriter;
import javax.faces.el.ValueBinding;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.search.impl.lucene.QueryParser;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.LimitBy;
@@ -49,6 +49,7 @@ import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.queryParser.QueryParser;
/**
* Component for selecting content from the repository
@@ -354,7 +355,7 @@ public class UIContentSelector extends UIInput
if (contains != null && contains.length() > 0)
{
String safeContains = QueryParser.escape(contains.trim());
String safeContains = LuceneQueryParser.escape(contains.trim());
query.append(" AND +@");
String nameAttr = Repository.escapeQName(QName.createQName(

View File

@@ -44,7 +44,6 @@ import javax.faces.event.FacesEvent;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.search.impl.lucene.QueryParser;
import org.alfresco.repo.security.authority.AuthorityDAO;
import org.alfresco.service.cmr.dictionary.AssociationDefinition;
import org.alfresco.service.cmr.repository.NodeRef;