Return-Path: X-Original-To: apmail-incubator-jena-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-jena-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 05EBB97A8 for ; Mon, 26 Mar 2012 11:46:59 +0000 (UTC) Received: (qmail 72302 invoked by uid 500); 26 Mar 2012 11:46:58 -0000 Delivered-To: apmail-incubator-jena-commits-archive@incubator.apache.org Received: (qmail 72269 invoked by uid 500); 26 Mar 2012 11:46:58 -0000 Mailing-List: contact jena-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jena-dev@incubator.apache.org Delivered-To: mailing list jena-commits@incubator.apache.org Received: (qmail 72214 invoked by uid 99); 26 Mar 2012 11:46:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 11:46:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2012 11:46:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9AD6D2388BF1; Mon, 26 Mar 2012 11:46:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1305317 [6/6] - in /incubator/jena/Jena2/ARQ/trunk: Grammar/ src/main/java/com/hp/hpl/jena/query/ src/main/java/com/hp/hpl/jena/sparql/algebra/ src/main/java/com/hp/hpl/jena/sparql/algebra/table/ src/main/java/com/hp/hpl/jena/sparql/core/ ... Date: Mon, 26 Mar 2012 11:46:10 -0000 To: jena-commits@incubator.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120326114611.9AD6D2388BF1@eris.apache.org> Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java?rev=1305317&r1=1305316&r2=1305317&view=diff ============================================================================== --- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java (original) +++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java Mon Mar 26 11:46:09 2012 @@ -262,36 +262,52 @@ public class QuerySerializer implements if ( query.hasBindings() ) { out.print("BINDINGS") ; - for ( Var v : query.getBindingVariables() ) + outputDataBlock(out, query.getBindingsVariables(), query.getBindingsData(), query) ; + } + } + + @Override + public void visitValues(Query query) + { + if ( query.hasValues() ) + { + out.print("VALUES") ; + outputDataBlock(out, query.getValuesVariables(), query.getValuesData(),query) ; + } + } + + private static void outputDataBlock(IndentedWriter out, List variables, List values, Query query) + { + for ( Var v : variables ) + { + out.print(" ") ; + out.print(v) ; + } + out.println(); + + out.print("{") ; + out.incIndent() ; + out.println() ; + for ( Binding valueRow : values ) + { + // A value may be null for UNDEF + out.print("(") ; + for ( Var var : variables ) { out.print(" ") ; - out.print(v) ; - } - out.println(); - - out.print("{") ; - out.incIndent() ; - out.println() ; - for ( Binding valueRow : query.getBindingValues() ) - { - // A value may be null for UNDEF - out.print("(") ; - for ( Var var : query.getBindingVariables() ) - { - out.print(" ") ; - Node value = valueRow.get(var) ; - if ( value == null ) - out.print("UNDEF") ; - else - out.print(FmtUtils.stringForNode(value, query)) ; - } - out.println(" )") ; + Node value = valueRow.get(var) ; + if ( value == null ) + out.print("UNDEF") ; + else + out.print(FmtUtils.stringForNode(value, query)) ; } - out.decIndent() ; - out.print("}") ; - out.println() ; + out.println(" )") ; } + out.decIndent() ; + out.print("}") ; + out.println() ; } + @Override public void finishVisit(Query query)