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

Fix for ALF-19690 CMIS TCK Test Failures

Browse Source 
- queries for checked out docs go to the DB

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2013-09-23 19:04:40 +00:00
parent 4025646982
commit 50bf8c4948
1 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -142,11 +142,6 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
{ {
private static Log logger = LogFactory.getLog(AlfrescoCmisService.class); private static Log logger = LogFactory.getLog(AlfrescoCmisService.class);
private static final QName PARAM_PARENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "parent");
private static final QName PARAM_USERNAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "username");
private static final String LUCENE_QUERY_CHECKEDOUT = "+=@cm\\:workingCopyOwner:${cm:username}";
private static final String LUCENE_QUERY_CHECKEDOUT_IN_FOLDER = "+=@cm\\:workingCopyOwner:${cm:username} +=PARENT:\"${cm:parent}\"";
private static final String MIN_FILTER = "cmis:name,cmis:baseTypeId,cmis:objectTypeId," private static final String MIN_FILTER = "cmis:name,cmis:baseTypeId,cmis:objectTypeId,"
+ "cmis:createdBy,cmis:creationDate,cmis:lastModifiedBy,cmis:lastModificationDate," + "cmis:createdBy,cmis:creationDate,cmis:lastModifiedBy,cmis:lastModificationDate,"
+ "cmis:contentStreamLength,cmis:contentStreamMimeType,cmis:contentStreamFileName," + "cmis:contentStreamLength,cmis:contentStreamMimeType,cmis:contentStreamFileName,"
@@ -812,30 +807,18 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
// prepare query // prepare query
SearchParameters params = new SearchParameters(); SearchParameters params = new SearchParameters();
params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO); params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
QueryParameterDefinition usernameDef = new QueryParameterDefImpl(
PARAM_USERNAME,
connector.getDictionaryService().getDataType(DataTypeDefinition.TEXT),
true,
AuthenticationUtil.getFullyAuthenticatedUser());
params.addQueryParameterDefinition(usernameDef);
if (folderId == null) if (folderId == null)
{ {
params.setQuery(LUCENE_QUERY_CHECKEDOUT); params.setQuery("+=cm:workingCopyOwner:\""+AuthenticationUtil.getFullyAuthenticatedUser()+"\"");
params.addStore(connector.getRootStoreRef()); params.addStore(connector.getRootStoreRef());
} }
else else
{ {
CMISNodeInfo folderInfo = getOrCreateFolderInfo(folderId, "Folder"); CMISNodeInfo folderInfo = getOrCreateFolderInfo(folderId, "Folder");
params.setQuery(LUCENE_QUERY_CHECKEDOUT_IN_FOLDER); params.setQuery("+=cm:workingCopyOwner:\""+AuthenticationUtil.getFullyAuthenticatedUser()+"\" +=PARENT:\""+folderInfo.getNodeRef().toString()+"\"");
params.addStore(folderInfo.getNodeRef().getStoreRef()); params.addStore(folderInfo.getNodeRef().getStoreRef());
QueryParameterDefinition parentDef = new QueryParameterDefImpl(
PARAM_PARENT,
connector.getDictionaryService().getDataType(DataTypeDefinition.NODE_REF),
true,
folderInfo.getNodeRef().toString());
params.addQueryParameterDefinition(parentDef);
} }
// set up order // set up order