Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

85015: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84136: Fix for ACE-1696    SOLR 4 - Support for name path - index only


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-09-20 10:18:43 +00:00
parent d2ccd686f2
commit c4ee02ff38

View File

@@ -846,11 +846,13 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
// Calculate name path
Collection<Collection<String>> namePaths = new ArrayList<Collection<String>>(2);
nodeMetaData.setNamePaths(namePaths);
for (Path path : directPaths)
for (Pair<Path, QName> catPair : paths)
{
Path path = catPair.getFirst();
boolean added = false;
List<String> namePath = new ArrayList<String>(path.size());
for (Path.Element pathElement : path)
NEXT_ELEMENT: for (Path.Element pathElement : path)
{
if (!(pathElement instanceof ChildAssocElement))
{
@@ -873,7 +875,7 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
// DH: There is no particular constraint here. This is just a decision made.
namePath.clear();
// We have to continue down the path as there could be a name path lower down
continue;
continue NEXT_ELEMENT;
}
// We can finally add the name to the path
namePath.add(childNodeName);