inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

Browse Source 
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:59:18 +00:00
parent fdb5f7bff5
commit 91acc8e050
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/web/bean/trashcan/TrashcanDialog.java
View File

@@ -33,7 +33,6 @@ 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.AbstractLuceneQueryParser;
import org.alfresco.repo.web.scripts.FileTypeImageUtils;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
@@ -47,6 +46,7 @@ import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.CachingDateFormat;
import org.alfresco.util.SearchLanguageConversion;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.context.IContextListener;
import org.alfresco.web.app.context.UIContextService;
@@ -618,7 +618,7 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener
else
{
// search by name in the archive store
String safeText = AbstractLuceneQueryParser.escape(property.getSearchText());
String safeText = SearchLanguageConversion.escapeLuceneQuery(property.getSearchText());
if (safeText.indexOf(' ') == -1)
{
if (property.isFullTextSearch())
@@ -680,8 +680,8 @@ public class TrashcanDialog extends BaseDialogBean implements IContextListener
if (fromDate != null)
{
SimpleDateFormat df = CachingDateFormat.getDateFormat();
String strFromDate = AbstractLuceneQueryParser.escape(df.format(fromDate));
String strToDate = AbstractLuceneQueryParser.escape(df.format(toDate));
String strFromDate = SearchLanguageConversion.escapeLuceneQuery(df.format(fromDate));
String strToDate = SearchLanguageConversion.escapeLuceneQuery(df.format(toDate));
StringBuilder buf = new StringBuilder(128);
buf.append("@").append(DATE_ATTR)
.append(":").append("[").append(strFromDate)