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

Build fix - remove tests that use meta-data query +multi-tenancy

Browse Source 
- fix 3.4 CMIS api to use metadata query

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2013-09-25 13:35:19 +00:00
parent 71cf67b6fe
commit d9deb51e29
1 changed files with 5 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
View File

@@ -129,17 +129,6 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
{ {
private static Log logger = LogFactory.getLog(CMISServicesImpl.class); private static Log logger = LogFactory.getLog(CMISServicesImpl.class);
/** Query Parameters */
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 int ASSOC_ID_PREFIX_LENGTH = ASSOC_ID_PREFIX.length(); private static final int ASSOC_ID_PREFIX_LENGTH = ASSOC_ID_PREFIX.length();
private static final Pattern ORDER_BY_PATTERN = Pattern.compile("^([^\\s,\"'\\\\\\.\\(\\)]+)\\s+(ASC|DESC)$"); private static final Pattern ORDER_BY_PATTERN = Pattern.compile("^([^\\s,\"'\\\\\\.\\(\\)]+)\\s+(ASC|DESC)$");
@@ -508,57 +497,6 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
return result; return result;
} }
/*
* Lucene based getChildren - deactivated
*/
public NodeRef[] XgetChildren(NodeRef parent, CMISTypesFilterEnum typesFilter, String orderBy)
throws CMISInvalidArgumentException
{
if (typesFilter == CMISTypesFilterEnum.POLICIES)
{
return new NodeRef[0];
}
SearchParameters params = new SearchParameters();
params.setLanguage(SearchService.LANGUAGE_LUCENE);
params.addStore(parent.getStoreRef());
QueryParameterDefinition parentDef = new QueryParameterDefImpl(PARAM_PARENT, nodeRefDataType, true, parent.toString());
params.addQueryParameterDefinition(parentDef);
// Build a query for the appropriate types
StringBuilder query = new StringBuilder(1024).append("+PARENT:\"${cm:parent}\" -ASPECT:\"").append(
ContentModel.ASPECT_WORKING_COPY).append("\" +TYPE:(");
// Include doc type if necessary
if (typesFilter != CMISTypesFilterEnum.FOLDERS)
{
query.append('"').append(ContentModel.TYPE_CONTENT).append('"');
}
// Include folder type if necessary
if (typesFilter != CMISTypesFilterEnum.DOCUMENTS)
{
if (typesFilter == CMISTypesFilterEnum.ANY)
{
query.append(" ");
}
query.append('"').append(ContentModel.TYPE_FOLDER).append('"');
}
// Always exclude system folders
query.append(") -TYPE:\"").append(ContentModel.TYPE_SYSTEM_FOLDER).append("\"");
params.setQuery(query.toString());
parseOrderBy(orderBy, params);
ResultSet resultSet = null;
try
{
resultSet = searchService.query(params);
List<NodeRef> results = resultSet.getNodeRefs();
NodeRef[] nodeRefs = new NodeRef[results.size()];
return results.toArray(nodeRefs);
}
finally
{
if (resultSet != null) resultSet.close();
}
}
@Override @Override
public NodeRef[] getChildren(NodeRef folderNodeRef, CMISTypesFilterEnum typesFilter, String orderBy) public NodeRef[] getChildren(NodeRef folderNodeRef, CMISTypesFilterEnum typesFilter, String orderBy)
@@ -702,15 +640,12 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
throws CMISInvalidArgumentException throws CMISInvalidArgumentException
{ {
SearchParameters params = new SearchParameters(); SearchParameters params = new SearchParameters();
params.setLanguage(SearchService.LANGUAGE_LUCENE); params.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
QueryParameterDefinition usernameDef = new QueryParameterDefImpl(PARAM_USERNAME, textDataType, true, username);
params.addQueryParameterDefinition(usernameDef);
if (folder == null) if (folder == null)
{ {
// get all checked-out items params.setQuery("+=cm:workingCopyOwner:\""+username+"\"");
params.setQuery(LUCENE_QUERY_CHECKEDOUT); params.addStore(folder.getStoreRef());
params.addStore(getDefaultRootStoreRef());
} }
else else
{ {
@@ -719,16 +654,13 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
if (includeDescendants && nodeService.getRootNode(folder.getStoreRef()) == folder) if (includeDescendants && nodeService.getRootNode(folder.getStoreRef()) == folder)
{ {
// get all checked-out items within specified folder store // get all checked-out items within specified folder store
params.setQuery(LUCENE_QUERY_CHECKEDOUT); params.setQuery("+=cm:workingCopyOwner:\""+username+"\"");
params.addStore(folder.getStoreRef()); params.addStore(folder.getStoreRef());
} }
else else
{ {
// TODO: implement descendants of folder params.setQuery("+=cm:workingCopyOwner:\""+username+"\" AND +=PARENT:\""+folder.toString()+"\"");
params.setQuery(LUCENE_QUERY_CHECKEDOUT_IN_FOLDER);
params.addStore(folder.getStoreRef()); params.addStore(folder.getStoreRef());
QueryParameterDefinition parentDef = new QueryParameterDefImpl(PARAM_PARENT, nodeRefDataType, true, folder.toString());
params.addQueryParameterDefinition(parentDef);
} }
} }
parseOrderBy(orderBy, params); parseOrderBy(orderBy, params);