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 DEV to HEAD:

Browse Source 
31815: Fix "It is impossible to search, create or add tags" (also related to ALF-10616)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2011-11-15 14:41:01 +00:00
parent 0b7432b4d0
commit 8bb6a9a372
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2010 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -147,9 +147,9 @@ public class LuceneCategoryServiceImpl implements CategoryService
{ {
return Collections.<ChildAssociationRef> emptyList(); return Collections.<ChildAssociationRef> emptyList();
} }
categoryRef = tenantService.getName(categoryRef); categoryRef = tenantService.getBaseName(categoryRef); // for solr
ResultSet resultSet = null; ResultSet resultSet = null;
try try
{ {
@@ -288,20 +288,18 @@ public class LuceneCategoryServiceImpl implements CategoryService
private Set<NodeRef> getClassificationNodes(StoreRef storeRef, QName qname) private Set<NodeRef> getClassificationNodes(StoreRef storeRef, QName qname)
{ {
storeRef = tenantService.getName(storeRef);
ResultSet resultSet = null; ResultSet resultSet = null;
try try
{ {
resultSet = indexerAndSearcher.getSearcher(storeRef, false).query(storeRef, "lucene", resultSet = indexerAndSearcher.getSearcher(storeRef, false).query(storeRef, "lucene",
"PATH:\"/" + getPrefix(qname.getNamespaceURI()) + ISO9075.encode(qname.getLocalName()) + "\"", null); "PATH:\"/" + getPrefix(qname.getNamespaceURI()) + ISO9075.encode(qname.getLocalName()) + "\"", null);
Set<NodeRef> nodeRefs = new HashSet<NodeRef>(resultSet.length()); Set<NodeRef> nodeRefs = new HashSet<NodeRef>(resultSet.length());
for (ResultSetRow row : resultSet) for (ResultSetRow row : resultSet)
{ {
nodeRefs.add(row.getNodeRef()); nodeRefs.add(row.getNodeRef());
} }
return nodeRefs; return nodeRefs;
} }
finally finally
@@ -315,8 +313,6 @@ public class LuceneCategoryServiceImpl implements CategoryService
public Collection<ChildAssociationRef> getClassifications(StoreRef storeRef) public Collection<ChildAssociationRef> getClassifications(StoreRef storeRef)
{ {
storeRef = tenantService.getName(storeRef);
ResultSet resultSet = null; ResultSet resultSet = null;
try try
{ {