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

Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD (to fix CLOUD-2269):

Browse Source 
60725: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
        60641: MNT-10103: Merged DEV to V4.2-BUG-FIX.
           59571: MNT-10103 Advanced Search by Tag or custom fields not working in 4.2
           59704: MNT-10103 Advanced Search by Tag or custom fields not working in 4.2
              - Was added AdvancedSearchTest test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@60796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2014-01-30 21:47:20 +00:00
parent d4fa4b1562
commit d51b5639d0
2 changed files with 126 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.lib.js
View File

@@ -937,7 +937,16 @@ function getSearchResults(params)
}
else
{
formQuery += (first ? '' : ' AND ') + escapeQName(propName) + ':\\"' + propValue + '\\"';
var index = propValue.lastIndexOf(" ");
formQuery += (first ? '' : ' AND ') + escapeQName(propName)
if (index > 0 && index < propValue.length - 1)
{
formQuery += ':(' + propValue + ')';
}
else
{
formQuery += ':"' + propValue + '"';
}
}
first = false;
}

116
source/test-java/org/alfresco/repo/web/scripts/search/AdvancedSearchTest.java Normal file
View File

@@ -0,0 +1,116 @@
package org.alfresco.repo.web.scripts.search;
import java.io.IOException;
import java.util.List;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.transaction.TransactionService;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
public class AdvancedSearchTest extends BaseWebScriptTest
{
private static final String TEST_FILE_NAME1 = "qwe iop.txt";
private static final String TEST_FILE_NAME2 = "qwe yu iop.txt";
private static final String SEARCH_NAME = "qwe iop";
private static final String TEST_FOLDER = "test_folder-" + System.currentTimeMillis();
private TransactionService transactionService;
private NodeService nodeService;
private FileFolderService fileFolderService;
private SearchService searchService;
private NamespaceService namespaceService;
private AuthenticationComponent authenticationComponent;
private NodeRef testNodeRef1;
private NodeRef testNodeRef2;
private NodeRef folderNodeRef;
@Override
protected void setUp() throws Exception
{
super.setUp();
this.transactionService = (TransactionService) getServer().getApplicationContext().getBean("TransactionService");
this.nodeService = (NodeService) getServer().getApplicationContext().getBean("NodeService");
this.fileFolderService = (FileFolderService)getServer().getApplicationContext().getBean("FileFolderService");
this.authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext().getBean("authenticationComponent");
this.searchService = (SearchService) getServer().getApplicationContext().getBean("SearchService");
this.namespaceService = (NamespaceService) getServer().getApplicationContext().getBean("namespaceService");
this.authenticationComponent.setSystemUserAsCurrentUser();
NodeRef rootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
List<NodeRef> results = searchService.selectNodes(rootNodeRef, "/app:company_home", null, namespaceService, false);
if (results.size() == 0)
{
throw new AlfrescoRuntimeException("Can't find /app:company_home");
}
NodeRef companyHomeNodeRef = results.get(0);
folderNodeRef = fileFolderService.create(companyHomeNodeRef, TEST_FOLDER, ContentModel.TYPE_FOLDER).getNodeRef();
testNodeRef1 = fileFolderService.create(folderNodeRef, TEST_FILE_NAME1, ContentModel.TYPE_CONTENT).getNodeRef();
testNodeRef2 = fileFolderService.create(folderNodeRef, TEST_FILE_NAME2, ContentModel.TYPE_CONTENT).getNodeRef();
assertNotNull(testNodeRef1);
assertNotNull(testNodeRef2);
}
@Override
protected void tearDown() throws Exception
{
super.tearDown();
RetryingTransactionCallback<Void> deleteCallback = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
deleteNodeIfExists(testNodeRef1);
deleteNodeIfExists(testNodeRef2);
deleteNodeIfExists(folderNodeRef);
return null;
}
private void deleteNodeIfExists(NodeRef nodeRef)
{
if (nodeService.exists(nodeRef))
{
nodeService.deleteNode(nodeRef);
}
}
};
this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback);
this.authenticationComponent.clearCurrentSecurityContext();
}
public void testSearchFile() throws IOException, JSONException
{
//Name search without quotes
String url = "/slingshot/search?site=&term=&tag=&maxResults=251&sort=&query={\"prop_cm_name\":\"" + SEARCH_NAME + "\",\"datatype\":\"cm:content\"}&repo=true&rootNode=alfresco://company/home";
Response res = sendRequest(new GetRequest(url), Status.STATUS_OK);
JSONObject result = new JSONObject(res.getContentAsString());
assertEquals(2, result.getInt("totalRecords"));
url = "/slingshot/search?site=&term=&tag=&maxResults=251&sort=&query={\"prop_cm_name\":\"\\\"" + SEARCH_NAME + "\\\"\",\"datatype\":\"cm:content\"}&repo=true&rootNode=alfresco://company/home";
res = sendRequest(new GetRequest(url), Status.STATUS_OK);
result = new JSONObject(res.getContentAsString());
assertEquals(1, result.getInt("totalRecords"));
}
}