mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
21536: Fix for ALF-4068 - IE6 XSS issue 21538: Added missing I18N label for when no wiki page defined in dashlet POST component 21562: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_14 to BRANCHES/DEV/V3.3-BUG-FIX: 20742: ALF-3572: Treat PasswordText as default for CMIS Web Service authentication 21575: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to BRANCHES/DEV/V3.3-BUG-FIX: 21098: Bug is related to unsupported CMISResultSetMetaDataImpl.getLimitBy() method. But LimitBy parameter is required for a lot of search logic parts including permissions and constraints checks. To support LimitBy parameter the following solution was implemented: 21578: Dictionary DAO: wrap initDictionary in writeLock - investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService (eg. b29/b59 of V3.3-BUG-FIX) 21593: Fix ALF-1703: properties of type 'propertyXML' are returned as 'propertyString' 21594: Fix ALF-4202: Cannot issue query with join via Web Services binding - wasn't issuing query with CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS query mode 21611: Fix ALF-2649: CMIS query join return partial entry result 21627: Merged V3.3 to V3.3-BUG-FIX 21532: Fix for ALF-3042: Missing Null check for the propertyDefinition. - fixed all unprotected uses within indexing and query 21534: Fix for ALF-2151: Range queries don't work. - docs updated - added unit test to check for failure of d:content ranges as expected 21558: Fix for ALF-4183 - Publishing a draft blog post does not turn on permission inheritence 21609: Fix NFS problems with gEdit and OpenOffice when editing documents in the root of the filesystem. ALF-3955. Also fixed an unreported issue where an InvalidNodeRefException is thrown by the file cache timer after several edit/save operations on a file. 21626: Merged PATCHES/V3.2.1 to V3.3 21606: ALF-4044: Introduced new policy.content.update.ignoreEmpty setting, that when true causes the repository to behave as it did before the fix to ALF-254. I.e. writing empty content will not trigger onContentPropertyUpdate policies or inbound content rules. This enables better compatibility with mac clients using CIFS or WebDAV; they actually create and close a file before appending its data. 21607: (RECORD ONLY) Incremented version label git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
199 lines
6.4 KiB
Java
199 lines
6.4 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.cmis.search;
|
|
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
import org.alfresco.cmis.CMISDictionaryService;
|
|
import org.alfresco.cmis.CMISJoinEnum;
|
|
import org.alfresco.cmis.CMISQueryEnum;
|
|
import org.alfresco.cmis.CMISQueryOptions;
|
|
import org.alfresco.cmis.CMISQueryService;
|
|
import org.alfresco.cmis.CMISResultSet;
|
|
import org.alfresco.cmis.CMISScope;
|
|
import org.alfresco.cmis.CMISServices;
|
|
import org.alfresco.cmis.CMISQueryOptions.CMISQueryMode;
|
|
import org.alfresco.repo.search.impl.querymodel.Query;
|
|
import org.alfresco.repo.search.impl.querymodel.QueryEngine;
|
|
import org.alfresco.repo.search.impl.querymodel.QueryEngineResults;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.search.LimitBy;
|
|
import org.alfresco.service.cmr.search.ResultSet;
|
|
|
|
/**
|
|
* @author andyh
|
|
*/
|
|
public class CMISQueryServiceImpl implements CMISQueryService
|
|
{
|
|
private CMISServices cmisService;
|
|
|
|
private CMISDictionaryService cmisDictionaryService;
|
|
|
|
private QueryEngine queryEngine;
|
|
|
|
private NodeService nodeService;
|
|
|
|
private DictionaryService alfrescoDictionaryService;
|
|
|
|
/**
|
|
* @param service
|
|
* the service to set
|
|
*/
|
|
public void setCMISService(CMISServices cmisService)
|
|
{
|
|
this.cmisService = cmisService;
|
|
}
|
|
|
|
/**
|
|
* @param cmisDictionaryService
|
|
* the cmisDictionaryService to set
|
|
*/
|
|
public void setCMISDictionaryService(CMISDictionaryService cmisDictionaryService)
|
|
{
|
|
this.cmisDictionaryService = cmisDictionaryService;
|
|
}
|
|
|
|
/**
|
|
* @param queryEngine
|
|
* the queryEngine to set
|
|
*/
|
|
public void setQueryEngine(QueryEngine queryEngine)
|
|
{
|
|
this.queryEngine = queryEngine;
|
|
}
|
|
|
|
/**
|
|
* @param nodeService
|
|
* the nodeService to set
|
|
*/
|
|
public void setNodeService(NodeService nodeService)
|
|
{
|
|
this.nodeService = nodeService;
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* @param alfrescoDictionaryService
|
|
* the Alfresco Dictionary Service to set
|
|
*/
|
|
public void setAlfrescoDictionaryService(DictionaryService alfrescoDictionaryService)
|
|
{
|
|
this.alfrescoDictionaryService = alfrescoDictionaryService;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
*
|
|
* @see org.alfresco.cmis.search.CMISQueryService#query(org.alfresco.cmis.search.CMISQueryOptions)
|
|
*/
|
|
public CMISResultSet query(CMISQueryOptions options)
|
|
{
|
|
CMISJoinEnum joinSupport = getJoinSupport();
|
|
if(options.getQueryMode() == CMISQueryOptions.CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS)
|
|
{
|
|
joinSupport = CMISJoinEnum.INNER_JOIN_SUPPORT;
|
|
}
|
|
|
|
// TODO: Refactor to avoid duplication of valid scopes here and in CMISQueryParser
|
|
|
|
CMISScope[] validScopes = (options.getQueryMode() == CMISQueryMode.CMS_STRICT) ? CmisFunctionEvaluationContext.STRICT_SCOPES : CmisFunctionEvaluationContext.ALFRESCO_SCOPES;
|
|
CmisFunctionEvaluationContext functionContext = new CmisFunctionEvaluationContext();
|
|
functionContext.setCmisDictionaryService(cmisDictionaryService);
|
|
functionContext.setNodeService(nodeService);
|
|
functionContext.setValidScopes(validScopes);
|
|
|
|
CMISQueryParser parser = new CMISQueryParser(options, cmisDictionaryService, joinSupport);
|
|
Query query = parser.parse(queryEngine.getQueryModelFactory(), functionContext);
|
|
|
|
QueryEngineResults results = queryEngine.executeQuery(query, options, functionContext);
|
|
Map<String, ResultSet> wrapped = new HashMap<String, ResultSet>();
|
|
Map<Set<String>, ResultSet> map = results.getResults();
|
|
for (Set<String> group : map.keySet())
|
|
{
|
|
ResultSet current = map.get(group);
|
|
for (String selector : group)
|
|
{
|
|
wrapped.put(selector, current);
|
|
}
|
|
}
|
|
LimitBy limitBy = null;
|
|
if ((null != results.getResults()) && !results.getResults().isEmpty() && (null != results.getResults().values()) && !results.getResults().values().isEmpty())
|
|
{
|
|
limitBy = results.getResults().values().iterator().next().getResultSetMetaData().getLimitedBy();
|
|
}
|
|
CMISResultSet cmis = new CMISResultSetImpl(wrapped, options, limitBy, nodeService, query, cmisDictionaryService, alfrescoDictionaryService);
|
|
return cmis;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
*
|
|
* @see org.alfresco.cmis.search.CMISQueryService#query(java.lang.String)
|
|
*/
|
|
public CMISResultSet query(String query)
|
|
{
|
|
CMISQueryOptions options = new CMISQueryOptions(query, cmisService.getDefaultRootStoreRef());
|
|
return query(options);
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
*
|
|
* @see org.alfresco.cmis.search.CMISQueryService#getPwcSearchable()
|
|
*/
|
|
public boolean getPwcSearchable()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
*
|
|
* @see org.alfresco.cmis.search.CMISQueryService#getAllVersionsSearchable()
|
|
*/
|
|
public boolean getAllVersionsSearchable()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
*
|
|
* @see org.alfresco.cmis.search.CMISQueryService#getQuerySupport()
|
|
*/
|
|
public CMISQueryEnum getQuerySupport()
|
|
{
|
|
return CMISQueryEnum.BOTH_COMBINED;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
*
|
|
* @see org.alfresco.cmis.search.CMISQueryService#getJoinSupport()
|
|
*/
|
|
public CMISJoinEnum getJoinSupport()
|
|
{
|
|
return CMISJoinEnum.NO_JOIN_SUPPORT;
|
|
}
|
|
}
|