From 3c067eca134e35f96d51289cdf1117809bdf3140 Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Tue, 19 May 2009 14:06:15 +0000 Subject: [PATCH] First pass at fixes/extensions/tidy ups to the search API - part of wiring FTS up as a query language MOB-568 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webservice/repository/SearchQuery.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/source/java/org/alfresco/repo/webservice/repository/SearchQuery.java b/source/java/org/alfresco/repo/webservice/repository/SearchQuery.java index d5bc6c18d8..770fa05a12 100644 --- a/source/java/org/alfresco/repo/webservice/repository/SearchQuery.java +++ b/source/java/org/alfresco/repo/webservice/repository/SearchQuery.java @@ -141,24 +141,11 @@ public class SearchQuery extends AbstractQuery } ResultSetRowNode rowNode = createResultSetRowNode(nodeRef, nodeService); - // get the data for the row and build up the columns structure - Map values = searchRow.getValues(); - NamedValue[] columns = new NamedValue[values.size() + 1]; - int col = 0; - for (Path path : values.keySet()) - { - // Get the attribute QName from the result path - String attributeName = path.last().toString(); - if (attributeName.startsWith("@") == true) - { - attributeName = attributeName.substring(1); - } - columns[col] = Utils.createNamedValue(dictionaryService, QName.createQName(attributeName), values.get(path)); - col++; - } - + + NamedValue[] columns = new NamedValue[1]; + // add one extra column for the node's path - columns[col] = Utils.createNamedValue(dictionaryService, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "path"), nodeService.getPath(nodeRef).toString()); + columns[0] = Utils.createNamedValue(dictionaryService, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "path"), nodeService.getPath(nodeRef).toString()); ResultSetRow row = new org.alfresco.repo.webservice.types.ResultSetRow(); row.setColumns(columns);