1.1 --- a/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java	Mon Jun 25 13:47:09 2012 +0300
     1.2 +++ b/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java	Mon Jun 25 14:32:27 2012 +0300
     1.3 @@ -19,13 +19,12 @@
     1.4  import static org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLConstants.URI_TAG;
     1.5  import static org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLConstants.VAR_NAME_ATT;
     1.6  import static org.openrdf.query.resultio.sparqlxml.SPARQLResultsXMLConstants.VAR_TAG;
     1.7 +import info.aduna.xml.XMLWriter;
     1.8  
     1.9  import java.io.IOException;
    1.10  import java.io.OutputStream;
    1.11  import java.util.List;
    1.12  
    1.13 -import info.aduna.xml.XMLWriter;
    1.14 -
    1.15  import org.openrdf.model.BNode;
    1.16  import org.openrdf.model.Literal;
    1.17  import org.openrdf.model.URI;
    1.18 @@ -38,11 +37,14 @@
    1.19  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    1.20  import org.openrdf.query.resultio.TupleQueryResultFormat;
    1.21  import org.openrdf.query.resultio.TupleQueryResultWriter;
    1.22 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
    1.23  
    1.24  /**
    1.25   * A {@link TupleQueryResultWriter} that writes tuple query results in the <a
    1.26   * href="http://www.w3.org/TR/rdf-sparql-XMLres/">SPARQL Query Results XML
    1.27   * Format</a>.
    1.28 + * 
    1.29 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    1.30   */
    1.31  public class stSPARQLResultsXMLWriter implements TupleQueryResultWriter {
    1.32  
    1.33 @@ -67,13 +69,9 @@
    1.34  		this.xmlWriter = xmlWriter;
    1.35  		this.xmlWriter.setPrettyPrint(true);
    1.36  	}
    1.37 -
    1.38 -	/*---------*
    1.39 -	 * Methods *
    1.40 -	 *---------*/
    1.41 -
    1.42 +	
    1.43  	public final TupleQueryResultFormat getTupleQueryResultFormat() {
    1.44 -		return TupleQueryResultFormat.SPARQL;
    1.45 +		return stSPARQLQueryResultFormat.XML;
    1.46  	}
    1.47  
    1.48  	/**
    1.49 @@ -148,20 +146,6 @@
    1.50  		}
    1.51  	}
    1.52  
    1.53 -//	private void writeValue(Value value)
    1.54 -//		throws IOException
    1.55 -//	{
    1.56 -//		if (value instanceof URI) {
    1.57 -//			writeURI((URI)value);
    1.58 -//		}
    1.59 -//		else if (value instanceof BNode) {
    1.60 -//			writeBNode((BNode)value);
    1.61 -//		}
    1.62 -//		else if (value instanceof Literal) {
    1.63 -//			writeLiteral((Literal)value);
    1.64 -//		}
    1.65 -//	}
    1.66 -	
    1.67  	private void writeValue(Value value) throws IOException {
    1.68  		if (value instanceof URI) {
    1.69  			writeURI((URI) value);

     2.1 --- a/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriterFactory.java	Mon Jun 25 13:47:09 2012 +0300
     2.2 +++ b/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriterFactory.java	Mon Jun 25 14:32:27 2012 +0300
     2.3 @@ -5,6 +5,7 @@
     2.4  import org.openrdf.query.resultio.TupleQueryResultFormat;
     2.5  import org.openrdf.query.resultio.TupleQueryResultWriter;
     2.6  import org.openrdf.query.resultio.TupleQueryResultWriterFactory;
     2.7 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
     2.8  
     2.9  /**
    2.10   * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    2.11 @@ -14,7 +15,7 @@
    2.12  
    2.13  	@Override
    2.14  	public TupleQueryResultFormat getTupleQueryResultFormat() {
    2.15 -		return TupleQueryResultFormat.SPARQL;
    2.16 +		return stSPARQLQueryResultFormat.XML;
    2.17  	}
    2.18  
    2.19  	@Override

     3.1 --- a/resultio/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java	Mon Jun 25 13:47:09 2012 +0300
     3.2 +++ b/resultio/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java	Mon Jun 25 14:32:27 2012 +0300
     3.3 @@ -24,6 +24,12 @@
     3.4  public class stSPARQLQueryResultFormat extends TupleQueryResultFormat {
     3.5  
     3.6  	/**
     3.7 +	 * XML format (extension of {@link TupleQueryResultFormat#SPARQL} format to include geometries)
     3.8 +	 */
     3.9 +	public static final stSPARQLQueryResultFormat XML = new stSPARQLQueryResultFormat("XML", 
    3.10 +			Arrays.asList("application/sparql-results+xml", "application/xml"), Charset.forName("UTF-8"), Arrays.asList("xml"));
    3.11 +	
    3.12 +	/**
    3.13  	 * KML format (see http://www.opengeospatial.org/standards/kml/)
    3.14  	 */
    3.15  	public static final stSPARQLQueryResultFormat KML = new stSPARQLQueryResultFormat("KML", 
    3.16 @@ -43,6 +49,7 @@
    3.17  	
    3.18  	// registers stSPARQL/GeoSPARQL formats
    3.19  	static {
    3.20 +		register(XML);
    3.21  		register(KML);
    3.22  		register(KMZ);
    3.23  		register(GEOJSON);