# HG changeset patch
# User Babis Nikolaou <charnik@di.uoa.gr>
# Date 1340623947 -10800
# Node ID 4db12593a767c0bc746e7c0ed1cba892faa2ec0c
# Parent  ee84ac7678c412352af189769c12f22bfd4af432
made stSPARQLResultsXMLWriter to return our XML format instead of the SPARQL one

diff -r ee84ac7678c4 -r 4db12593a767 resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java
--- a/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java	Mon Jun 25 13:47:09 2012 +0300
+++ b/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java	Mon Jun 25 14:32:27 2012 +0300
@@ -19,13 +19,12 @@
 import static org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLConstants.URI_TAG;
 import static org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLConstants.VAR_NAME_ATT;
 import static org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLConstants.VAR_TAG;
+import info.aduna.xml.XMLWriter;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
-import info.aduna.xml.XMLWriter;
-
 import org.openrdf.model.BNode;
 import org.openrdf.model.Literal;
 import org.openrdf.model.URI;
@@ -38,11 +37,14 @@
 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
 import org.openrdf.query.resultio.TupleQueryResultFormat;
 import org.openrdf.query.resultio.TupleQueryResultWriter;
+import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
 
 /**
  * A {@link TupleQueryResultWriter} that writes tuple query results in the <a
  * href="http://www.w3.org/TR/rdf-sparql-XMLres/">SPARQL Query Results XML
  * Format</a>.
+ * 
+ * @author Manos Karpathiotakis <mk@di.uoa.gr>
  */
 public class stSPARQLResultsXMLWriter implements TupleQueryResultWriter {
 
@@ -67,13 +69,9 @@
 		this.xmlWriter = xmlWriter;
 		this.xmlWriter.setPrettyPrint(true);
 	}
-
-	/*---------*
-	 * Methods *
-	 *---------*/
-
+	
 	public final TupleQueryResultFormat getTupleQueryResultFormat() {
-		return TupleQueryResultFormat.SPARQL;
+		return stSPARQLQueryResultFormat.XML;
 	}
 
 	/**
@@ -148,20 +146,6 @@
 		}
 	}
 
-//	private void writeValue(Value value)
-//		throws IOException
-//	{
-//		if (value instanceof URI) {
-//			writeURI((URI)value);
-//		}
-//		else if (value instanceof BNode) {
-//			writeBNode((BNode)value);
-//		}
-//		else if (value instanceof Literal) {
-//			writeLiteral((Literal)value);
-//		}
-//	}
-	
 	private void writeValue(Value value) throws IOException {
 		if (value instanceof URI) {
 			writeURI((URI) value);
diff -r ee84ac7678c4 -r 4db12593a767 resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriterFactory.java
--- a/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriterFactory.java	Mon Jun 25 13:47:09 2012 +0300
+++ b/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriterFactory.java	Mon Jun 25 14:32:27 2012 +0300
@@ -5,6 +5,7 @@
 import org.openrdf.query.resultio.TupleQueryResultFormat;
 import org.openrdf.query.resultio.TupleQueryResultWriter;
 import org.openrdf.query.resultio.TupleQueryResultWriterFactory;
+import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
 
 /**
  * @author Charalampos Nikolaou <charnik@di.uoa.gr>
@@ -14,7 +15,7 @@
 
 	@Override
 	public TupleQueryResultFormat getTupleQueryResultFormat() {
-		return TupleQueryResultFormat.SPARQL;
+		return stSPARQLQueryResultFormat.XML;
 	}
 
 	@Override
diff -r ee84ac7678c4 -r 4db12593a767 resultio/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java
--- a/resultio/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java	Mon Jun 25 13:47:09 2012 +0300
+++ b/resultio/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java	Mon Jun 25 14:32:27 2012 +0300
@@ -24,6 +24,12 @@
 public class stSPARQLQueryResultFormat extends TupleQueryResultFormat {
 
 	/**
+	 * XML format (extension of {@link TupleQueryResultFormat#SPARQL} format to include geometries)
+	 */
+	public static final stSPARQLQueryResultFormat XML = new stSPARQLQueryResultFormat("XML", 
+			Arrays.asList("application/sparql-results+xml", "application/xml"), Charset.forName("UTF-8"), Arrays.asList("xml"));
+	
+	/**
 	 * KML format (see http://www.opengeospatial.org/standards/kml/)
 	 */
 	public static final stSPARQLQueryResultFormat KML = new stSPARQLQueryResultFormat("KML", 
@@ -43,6 +49,7 @@
 	
 	// registers stSPARQL/GeoSPARQL formats
 	static {
+		register(XML);
 		register(KML);
 		register(KMZ);
 		register(GEOJSON);