From f17f156887d810663895f3d8217542f3b94c7194 Mon Sep 17 00:00:00 2001 From: Steven Glover Date: Thu, 19 Aug 2010 19:02:18 +0000 Subject: [PATCH] ALF-4194 - minor fixes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/metadata/BulkMetadataGet.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java b/source/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java index 9f9c89d668..c126716bfb 100644 --- a/source/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java +++ b/source/java/org/alfresco/repo/web/scripts/metadata/BulkMetadataGet.java @@ -13,7 +13,6 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.namespace.QName; import org.json.JSONArray; import org.json.JSONException; @@ -37,7 +36,7 @@ public class BulkMetadataGet extends AbstractWebScript { private ServiceRegistry services; private NodeService nodeService; private DictionaryService dictionaryService; - + private String getMimeType(ContentData contentProperty) { String mimetype = null; @@ -49,7 +48,7 @@ public class BulkMetadataGet extends AbstractWebScript { return mimetype; } - + @Override public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException { @@ -86,6 +85,7 @@ public class BulkMetadataGet extends AbstractWebScript { for(int i = 0; i < nodeRefsArray.length(); i++) { NodeRef nodeRef = new NodeRef(nodeRefsArray.getString(i)); + if(nodeService.exists(nodeRef)) { NodeRef parentNodeRef = null; @@ -107,12 +107,10 @@ public class BulkMetadataGet extends AbstractWebScript { jsonOut.writeValue("shortType", shortType); TypeDefinition typeDef = dictionaryService.getType(type); jsonOut.writeValue("typeTitle", typeDef.getTitle()); - // TODO is this always cm:title? what if custom type? - jsonOut.writeValue("name", properties.get(ContentModel.PROP_NAME).toString()); - jsonOut.writeValue("title", properties.get(ContentModel.PROP_TITLE).toString()); + + jsonOut.writeValue("name", (String)properties.get(ContentModel.PROP_NAME)); + jsonOut.writeValue("title", (String)properties.get(ContentModel.PROP_TITLE)); jsonOut.writeValue("mimeType", getMimeType((ContentData)properties.get(ContentModel.PROP_CONTENT))); - Path path = nodeService.getPath(nodeRef); - jsonOut.writeValue("path", path.toString()); } jsonOut.endObject(); }