inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)

Browse Source 
118237 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Fixed spacing by removing tabs as per Derek's request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-23 10:57:08 +00:00
parent e00500f6f0
commit 0c55fc5905
3 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/exporter/ExporterComponent.java
View File

@@ -391,8 +391,8 @@ public class ExporterComponent
// explicitly included ?
if (parameters.getIncludedPaths() != null)
{
String nodePathPrefixString = nodeService.getPath(nodeRef).toPrefixString(namespaceService);
if (! (isIncludedPath(parameters.getIncludedPaths(), nodePathPrefixString)))
String nodePathPrefixString = nodeService.getPath(nodeRef).toPrefixString(namespaceService);
if (! (isIncludedPath(parameters.getIncludedPaths(), nodePathPrefixString)))
{
return;
}
@@ -515,7 +515,7 @@ public class ExporterComponent
// Export node children
if (parameters.isCrawlChildNodes())
{
// sort associations into assoc type buckets filtering out unneccessary associations
// sort associations into assoc type buckets filtering out unneccessary associations
Map<QName, List<ChildAssociationRef>> assocTypes = new HashMap<QName, List<ChildAssociationRef>>();
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(nodeRef);
for (ChildAssociationRef childAssoc : childAssocs)
@@ -540,7 +540,7 @@ public class ExporterComponent
}
if (isExcludedURI(parameters.getExcludeNamespaceURIs(), childAssoc.getQName().getNamespaceURI()))
{
continue;
continue;
}
List<ChildAssociationRef> assocRefs = assocTypes.get(childAssocType);
@@ -551,7 +551,7 @@ public class ExporterComponent
}
assocRefs.add(childAssoc);
}
// output each association type bucket
if (assocTypes.size() > 0)
{
@@ -592,7 +592,7 @@ public class ExporterComponent
else
{
exporter.endNode(nodeRef);
}
}
}
/**
@@ -688,7 +688,7 @@ public class ExporterComponent
*/
private void walkNodeSecondaryLinks(NodeRef nodeRef, ExporterCrawlerParameters parameters, Exporter exporter)
{
// sort associations into assoc type buckets filtering out unneccessary associations
// sort associations into assoc type buckets filtering out unneccessary associations
Map<QName, List<ChildAssociationRef>> assocTypes = new HashMap<QName, List<ChildAssociationRef>>();
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(nodeRef);
for (ChildAssociationRef childAssoc : childAssocs)
@@ -724,7 +724,7 @@ public class ExporterComponent
}
assocRefs.add(childAssoc);
}
// output each association type bucket
if (assocTypes.size() > 0)
{
@@ -758,7 +758,7 @@ public class ExporterComponent
*/
private void walkNodeAssociations(NodeRef nodeRef, ExporterCrawlerParameters parameters, Exporter exporter)
{
// sort associations into assoc type buckets filtering out unneccessary associations
// sort associations into assoc type buckets filtering out unneccessary associations
Map<QName, List<AssociationRef>> assocTypes = new HashMap<QName, List<AssociationRef>>();
List<AssociationRef> assocs = nodeService.getTargetAssocs(nodeRef, RegexQNamePattern.MATCH_ALL);
for (AssociationRef assoc : assocs)
@@ -781,7 +781,7 @@ public class ExporterComponent
}
assocRefs.add(assoc);
}
// output each association type bucket
if (assocTypes.size() > 0)
{