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 V4.1-BUG-FIX to HEAD

Browse Source 
42725: Record Only Merge: V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      << Record only as 4.1.2 used PDFBOX 1.0.7 rather than 1.0.6 >>
      42721: ALF-14185 PDF not indexed as a result of PDFBOX-1143 workaround in Tika 
   42726: ALF-16388 CLONE: PDF not indexed as a result of PDFBOX-1143 workaround in Tika
      - 4.1 specific fix (uses PDFBox 1.0.7) for the same issue as ALF-14185 on 3.4 (uses PDFBox 1.0.6).
   42736: ALF-16093: Implement new getPeople CQ (eg. if using user admin console and/or Solr unavailable)
   42740: Merged DEV to V4.1-BUG-FIX
      42626: ALF-14336: SOLR indexing fails with unterminated string for PDF uploaded
             Appeared exception due to postgreSQL (http://archives.postgresql.org/pgsql-jdbc/2007-02/msg00107.php).
             Remove '\u0000' characters from the property. 
   42741: Fix for ALF-16332 - Alternative version of AbstractWebScriptViewResolver that uses a ConcurrentHashMap and thus allows multiple views to be resolved at the same time!
   42755: Merged DEV to V4.1-BUG-FIX
     42750 : ALF-16315
   42762: ALF-15616: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      42758: ALF-11956 WCM accessibility
         - tabIndex code. See comment on 17 Oct 2012
           "4) TinyMCE fields are not accessible using the keyboard (you have to use the mouse to select the "click to edit" option) - > It's reproduced for (+) icon, content created on press-release.xsd."
   42768: Merged somehow-lost mergeinfo from r42679
   42769: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42738: ALF-12724 CLONE - Activities trigger high CPU usage and lock contention 
      42767: Merged V3.4 to V3.4-BUG-FIX
         42727: ALF-16366: PermissionService calls were updating nodes but not reindexing them, leaving out of sync transactions after a clean bootstrap!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-10-17 19:45:37 +00:00
parent 4dc751ee3a
commit 46f9f8c24e
14 changed files with 1192 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

315
source/java/org/alfresco/repo/security/person/GetPeopleCannedQuery.java Normal file
View File

@@ -0,0 +1,315 @@
/*
* Copyright (C) 2005-2012 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.repo.security.person;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.query.AbstractCannedQuery;
import org.alfresco.query.CannedQueryParameters;
import org.alfresco.query.CannedQuerySortDetails;
import org.alfresco.query.CannedQuerySortDetails.SortOrder;
import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.domain.query.CannedQueryDAO;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.alfresco.util.ParameterCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* GetPeople canned query
*
* To get paged list of children of a parent node filtered by child type.
* Also optionally filtered and/or sorted by one or more properties (up to three).
*
* @author janv
* @since 4.1.2
*/
public class GetPeopleCannedQuery extends AbstractCannedQuery<NodeRef>
{
private Log logger = LogFactory.getLog(getClass());
private static final String QUERY_NAMESPACE = "alfresco.query.people";
private static final String QUERY_SELECT_GET_PEOPLE = "select_GetPeopleCannedQuery";
public static final int MAX_FILTER_SORT_PROPS = 3;
private NodeDAO nodeDAO;
private QNameDAO qnameDAO;
private CannedQueryDAO cannedQueryDAO;
private TenantService tenantService;
public GetPeopleCannedQuery(
NodeDAO nodeDAO,
QNameDAO qnameDAO,
CannedQueryDAO cannedQueryDAO,
TenantService tenantService,
CannedQueryParameters params)
{
super(params);
this.nodeDAO = nodeDAO;
this.qnameDAO = qnameDAO;
this.cannedQueryDAO = cannedQueryDAO;
this.tenantService = tenantService;
}
@Override
protected List<NodeRef> queryAndFilter(CannedQueryParameters parameters)
{
Long start = (logger.isDebugEnabled() ? System.currentTimeMillis() : null);
// Get parameters
GetPeopleCannedQueryParams paramBean = (GetPeopleCannedQueryParams)parameters.getParameterBean();
// Get parent node
NodeRef parentRef = paramBean.getParentRef();
ParameterCheck.mandatory("nodeRef", parentRef);
Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(parentRef);
if (nodePair == null)
{
throw new InvalidNodeRefException("Parent node does not exist: " + parentRef, parentRef);
}
Long parentNodeId = nodePair.getFirst();
// Set query params - note: currently using SortableChildEntity to hold (supplemental-) query params
FilterSortPersonEntity params = new FilterSortPersonEntity();
// Set parent node id
params.setParentNodeId(parentNodeId);
// Get filter details
final List<QName> filterProps = paramBean.getFilterProps();
// Get sort details
CannedQuerySortDetails sortDetails = parameters.getSortDetails();
@SuppressWarnings({ "unchecked", "rawtypes" })
final List<Pair<QName, SortOrder>> sortPairs = (List)sortDetails.getSortPairs();
String pattern = paramBean.getPattern();
if ((sortPairs.size() > 0) && ((pattern == null) || (pattern.equals(""))))
{
// note: although no pattern means no filtering required, we currently need to match all if sort required
pattern = "%";
}
else if ((! pattern.endsWith("%")) && (! pattern.endsWith("*")))
{
// implicit startsWith match
pattern = pattern + "%";
}
// Set filter pattern
params.setPattern(pattern);
// Set sort / filter params
// Note - need to keep the sort properties in their requested order
List<QName> sortFilterProps = new ArrayList<QName>(MAX_FILTER_SORT_PROPS);
Map<QName, Boolean> sortAsc = new HashMap<QName, Boolean>(MAX_FILTER_SORT_PROPS);
// add sort props first
for (Pair<QName, SortOrder> sort : sortPairs)
{
QName sortQName = sort.getFirst();
if ((filterProps.size() > 0) && (! filterProps.contains(sortQName)))
{
throw new AlfrescoRuntimeException("GetPeople: cannot sort by a non-filter property: "+sortQName+" (filterStringProps="+filterProps+")");
}
if (! sortFilterProps.contains(sortQName))
{
sortFilterProps.add(sortQName);
sortAsc.put(sortQName, sort.getSecond().equals(SortOrder.ASCENDING));
}
}
// add any additional filter props (not part of sort)
for (QName filterQName : filterProps)
{
if (! sortFilterProps.contains(filterQName))
{
sortFilterProps.add(filterQName);
sortAsc.put(filterQName, null);
}
}
int filterSortPropCnt = sortFilterProps.size();
if (filterSortPropCnt > MAX_FILTER_SORT_PROPS)
{
throw new AlfrescoRuntimeException("GetPeople: exceeded maximum number filter/sort properties: (max="+MAX_FILTER_SORT_PROPS+", actual="+filterSortPropCnt);
}
filterSortPropCnt = setFilterSortParams(sortFilterProps, sortAsc, params);
// filtered and/or sorted - note: permissions not applicable for getPeople
final List<NodeRef> result = new ArrayList<NodeRef>(100);
final PersonQueryCallback c = new DefaultPersonQueryCallback(result);
PersonResultHandler resultHandler = new PersonResultHandler(c);
int offset = parameters.getPageDetails().getSkipResults();
int limit = parameters.getPageDetails().getPageSize();
if (limit != Integer.MAX_VALUE)
{
// to enable hasMore flag
limit++;
}
cannedQueryDAO.executeQuery(QUERY_NAMESPACE, QUERY_SELECT_GET_PEOPLE, params, offset, limit, resultHandler);
resultHandler.done();
if (start != null)
{
logger.debug("Base query: "+result.size()+" in "+(System.currentTimeMillis()-start)+" msecs");
}
return result;
}
// Set filter/sort props (between 0 and 3)
private int setFilterSortParams(List<QName> filterSortProps, Map<QName, Boolean> sortAsc, FilterSortPersonEntity params)
{
int cnt = 0;
int propCnt = 0;
for (QName filterSortProp : filterSortProps)
{
Long sortQNameId = getQNameId(filterSortProp);
Boolean sortOrder = sortAsc.get(filterSortProp); // true = ascending, false = descending, null = unsorted
if (sortQNameId != null)
{
if (propCnt == 0)
{
params.setProp1qnameId(sortQNameId);
params.setSort1asc(sortOrder);
}
else if (propCnt == 1)
{
params.setProp2qnameId(sortQNameId);
params.setSort2asc(sortOrder);
}
else if (propCnt == 2)
{
params.setProp3qnameId(sortQNameId);
params.setSort3asc(sortOrder);
}
else
{
// belts and braces
throw new AlfrescoRuntimeException("GetPeople: unexpected - cannot set sort parameter: "+cnt);
}
propCnt++;
}
else
{
logger.warn("Skipping filter/sort param - cannot find: "+filterSortProp);
break;
}
cnt++;
}
return cnt;
}
private Long getQNameId(QName sortPropQName)
{
Pair<Long, QName> qnamePair = qnameDAO.getQName(sortPropQName);
return (qnamePair == null ? null : qnamePair.getFirst());
}
@Override
protected boolean isApplyPostQuerySorting()
{
// note: sorted as part of the query impl
return false;
}
@Override
protected boolean isApplyPostQueryPermissions()
{
return false;
}
@Override
protected boolean isApplyPostQueryPaging()
{
return false;
}
@Override
protected Pair<Integer, Integer> getTotalResultCount(List<NodeRef> results)
{
return null;
}
protected interface PersonQueryCallback
{
boolean handle(NodeRef personRef);
}
protected class DefaultPersonQueryCallback implements PersonQueryCallback
{
private List<NodeRef> children;
public DefaultPersonQueryCallback(final List<NodeRef> children)
{
this.children = children;
}
@Override
public boolean handle(NodeRef personRef)
{
children.add(tenantService.getBaseName(personRef));
// More results
return true;
}
}
protected class PersonResultHandler implements CannedQueryDAO.ResultHandler<String>
{
private final PersonQueryCallback resultsCallback;
private PersonResultHandler(PersonQueryCallback resultsCallback)
{
this.resultsCallback = resultsCallback;
}
public boolean handleResult(String uuid)
{
// Call back
return resultsCallback.handle(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, uuid));
}
public void done()
{
}
}
}