Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E26F17A78 for ; Sat, 18 Apr 2015 09:48:54 +0000 (UTC) Received: (qmail 33019 invoked by uid 500); 18 Apr 2015 09:48:54 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 32962 invoked by uid 500); 18 Apr 2015 09:48:54 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 32838 invoked by uid 99); 18 Apr 2015 09:48:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Apr 2015 09:48:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B856E07A7; Sat, 18 Apr 2015 09:48:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reto@apache.org To: commits@clerezza.apache.org Date: Sat, 18 Apr 2015 09:48:57 -0000 Message-Id: In-Reply-To: <7f3a8dba48b2485f804ab2588caf7a8a@git.apache.org> References: <7f3a8dba48b2485f804ab2588caf7a8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] clerezza git commit: CLEREZZA-988: returning Unparsed instead of a parse XML-Sequence CLEREZZA-988: returning Unparsed instead of a parse XML-Sequence Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/bd2519d6 Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/bd2519d6 Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/bd2519d6 Branch: refs/heads/master Commit: bd2519d672205bb8ca68cc1f236557df3e027f4a Parents: 51eade1 Author: Reto Gmuer Authored: Sat Apr 18 09:35:58 2015 +0000 Committer: Reto Gmuer Committed: Sat Apr 18 09:48:38 2015 +0000 ---------------------------------------------------------------------- .../clerezza/platform/typerendering/scala/XmlResult.scala | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/bd2519d6/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala ---------------------------------------------------------------------- diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala index c291bdf..0ac21a0 100644 --- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala +++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala @@ -73,12 +73,9 @@ abstract class XmlResult(arguments: XmlResult.Arguments) { } def render(resource: GraphNode, mode: String) = { - def parseNodeSeq(string: String) = { - _root_.scala.xml.XML.loadString("" + string + "").child - } val baos = new java.io.ByteArrayOutputStream renderer.render(resource, context, mode, baos) - parseNodeSeq(new String(baos.toByteArray, UTF8)) + Unparsed(new String(baos.toByteArray, UTF8)) } /** @@ -97,12 +94,9 @@ abstract class XmlResult(arguments: XmlResult.Arguments) { * rendered by the caller but getting a new context using the GraphNodeProvider */ def render(resource: IRI, mode: String) = { - def parseNodeSeq(string: String) = { - _root_.scala.xml.XML.loadString("" + string + "").child - } val baos = new java.io.ByteArrayOutputStream renderer.render(resource, context, mode, baos) - parseNodeSeq(new String(baos.toByteArray, UTF8)) + Unparsed(new String(baos.toByteArray, UTF8)) } /**