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

@@ -39,7 +39,7 @@ import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.archive.RestoreNodeReport;
import org.alfresco.repo.node.archive.RestoreNodeReport.RestoreStatus;
import org.alfresco.repo.search.impl.lucene.QueryParser;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
import org.alfresco.repo.web.scripts.FileTypeImageUtils;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
@@ -594,7 +594,7 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener
else
{
// search by name in the archive store
String safeText = QueryParser.escape(property.getSearchText());
String safeText = LuceneQueryParser.escape(property.getSearchText());
if (safeText.indexOf(' ') == -1)
{
if (property.isFullTextSearch())
@@ -656,8 +656,8 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener
if (fromDate != null)
{
SimpleDateFormat df = CachingDateFormat.getDateFormat();
String strFromDate = QueryParser.escape(df.format(fromDate));
String strToDate = QueryParser.escape(df.format(toDate));
String strFromDate = LuceneQueryParser.escape(df.format(fromDate));
String strToDate = LuceneQueryParser.escape(df.format(toDate));
StringBuilder buf = new StringBuilder(128);
buf.append("@").append(DATE_ATTR)
.append(":").append("[").append(strFromDate)