inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-23 18:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AR-1616

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana 2007-07-21 00:53:36 +00:00
parent 4acbe9e7c3
commit c44e6bb01c
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/repo/importer/view/ViewParser.java
View File

@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.Stack; import java.util.Stack;
import org.alfresco.repo.importer.Importer; import org.alfresco.repo.importer.Importer;
@ -439,40 +440,45 @@ public class ViewParser implements Parser
String idRefAttr = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_IDREF_ATTR); String idRefAttr = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_IDREF_ATTR);
String pathRefAttr = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_PATHREF_ATTR); String pathRefAttr = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_PATHREF_ATTR);
String nodeRefAttr = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_NODEREF_ATTR); String nodeRefAttr = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_NODEREF_ATTR);
if ((idRefAttr != null && idRefAttr.length() > 0) && (pathRefAttr != null && pathRefAttr.length() > 0) && (nodeRefAttr != null && nodeRefAttr.length() > 0)) if ((idRefAttr != null && idRefAttr.length() > 0) && (pathRefAttr != null && pathRefAttr.length() > 0) && (nodeRefAttr != null && nodeRefAttr.length() > 0))
{ {
// Do not support both IDREF and PATHREF // Do not support both IDREF and PATHREF
throw new ImporterException("Only one of " + VIEW_IDREF_ATTR + " or " + VIEW_PATHREF_ATTR + " or " + VIEW_NODEREF_ATTR + " can be specified."); throw new ImporterException("Only one of " + VIEW_IDREF_ATTR + " or " + VIEW_PATHREF_ATTR + " or " + VIEW_NODEREF_ATTR + " can be specified.");
} }
// Convert to Node Reference
NodeRef nodeRef = null;
if (nodeRefAttr != null) if (nodeRefAttr != null)
{ {
NodeRef nodeRef = new NodeRef(nodeRefAttr); nodeRef = new NodeRef(nodeRefAttr);
node.setUUID(nodeRef.getId());
node.setTypeDefinition(dictionaryService.getType(nodeService.getType(nodeRef)));
} }
else if (idRefAttr != null && idRefAttr.length() > 0) else if (idRefAttr != null && idRefAttr.length() > 0)
{ {
// retrieve uuid from previously imported node // retrieve uuid from previously imported node
NodeRef nodeRef = getImportReference(parserContext, idRefAttr); nodeRef = getImportReference(parserContext, idRefAttr);
if (nodeRef == null) if (nodeRef == null)
{ {
throw new ImporterException("Cannot find node referenced by id " + idRefAttr); throw new ImporterException("Cannot find node referenced by id " + idRefAttr);
} }
node.setUUID(nodeRef.getId());
node.setTypeDefinition(dictionaryService.getType(nodeService.getType(nodeRef)));
} }
else if (pathRefAttr != null && pathRefAttr.length() > 0) else if (pathRefAttr != null && pathRefAttr.length() > 0)
{ {
NodeRef referencedRef = parserContext.importer.resolvePath(pathRefAttr); nodeRef = parserContext.importer.resolvePath(pathRefAttr);
if (referencedRef == null) if (nodeRef == null)
{ {
throw new ImporterException("Cannot find node referenced by path " + pathRefAttr); throw new ImporterException("Cannot find node referenced by path " + pathRefAttr);
} }
node.setUUID(referencedRef.getId());
node.setTypeDefinition(dictionaryService.getType(nodeService.getType(referencedRef)));
} }
// Establish node definition
node.setUUID(nodeRef.getId());
node.setTypeDefinition(dictionaryService.getType(nodeService.getType(nodeRef)));
Set<QName> aspects = nodeService.getAspects(nodeRef);
for (QName aspect : aspects)
{
node.addAspect(dictionaryService.getAspect(aspect));
}
// Extract child name if explicitly defined // Extract child name if explicitly defined
String childName = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_CHILD_NAME_ATTR); String childName = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_CHILD_NAME_ATTR);
if (childName != null && childName.length() > 0) if (childName != null && childName.length() > 0)