By default, set correct content type headers for SPARQL (XML) resultset

Author: samuell

classes/RDFIO_SpecialPage.php

@@ -41,27 +41,27 @@ private function setHeadersForOutputType( $outputType ) {
 		$wRequest = $this->getRequest();
 
 		$contentTypeMap = array(
-			'xml'     => 'application/xml',
-			'rdfxml'  => 'application/xml',
-			'json'    => 'application/json',
-			'turtle'  => 'text/html',
-			'htmltab' => '', // Not applicable
-			'tsv'     => 'text/html'
+			'sparqlresult' => 'application/sparql-results+xml',
+			'rdfxml'       => 'application/xml',
+			'json'         => 'application/json',
+			'turtle'       => 'text/html',
+			'htmltab'      => '', // Not applicable
+			'tsv'          => 'text/html'
 		);
 
 		$extensionMap = array(
-			'xml'     => '.xml',
-			'rdfxml'  => '_rdf.xml',
-			'json'    => '.json',
-			'turtle'  => '.ttl',
-			'htmltab' => '', // Not applicable
-			'tsv'     => '.tsv'
+			'sparqlresult' => '.xml',
+			'rdfxml'       => '_rdf.xml',
+			'json'         => '.json',
+			'turtle'       => '.ttl',
+			'htmltab'      => '', // Not applicable
+			'tsv'          => '.tsv'
 		);
 
 		if ( $outputType != 'htmltab' ) { // For HTML table we are taking care of the output earlier
 			$wRequest->response()->header( 'Content-type: ' . $contentTypeMap[$outputType] . '; charset=utf-8' );
 
-			$fileName = urlencode('sparql_output_' . wfTimestampNow() . $extensionMap[$outputType] );
+			$fileName = urlencode('sparql_result_' . wfTimestampNow() . $extensionMap[$outputType] );
 			$wRequest->response()->header( 'Content-disposition: attachment;filename=' . $fileName );
 		}
 	}

specials/SpecialSPARQLEndpoint.php

@@ -87,22 +87,23 @@ private function executeReadOnlyQuery( $options ) {
 		}
 
 		if ( $options->queryType == 'select' ) {
-			if ( $options->outputType == 'htmltab' ) {
-				$resultHtml = $this->sparqlResultToHTML( $outputArr );
+			if ( $options->outputType == 'rdfxml' ) {
+				$this->errorMsg( wfMessage( 'rdfio-error-invalid-output-for-select' )->parse() );
 				$this->printHTMLForm( $options );
-				$wikiOut->addHTML( $resultHtml );
 				return;
 			}
 
-			if ( $options->outputType == 'xml' ) {
-				$this->prepareCreatingDownloadableFile( $options );
-				// Using echo instead of $wgOut->addHTML() here, since output format is not HTML
-				echo $this->sparqlendpoint->getSPARQLXMLSelectResultDoc( $outputArr );
+			if ( $options->outputType == 'htmltab' ) {
+				$resultHtml = $this->sparqlResultToHTML( $outputArr );
+				$this->printHTMLForm( $options );
+				$wikiOut->addHTML( $resultHtml );
 				return;
 			}
 
-			$this->errorMsg(  );
-			$this->printHTMLForm( $options );
+			// Default option: Return SPARQL result document
+			$this->prepareCreatingDownloadableFile( $options );
+			// Using echo instead of $wgOut->addHTML() here, since output format is not HTML
+			echo $this->sparqlendpoint->getSPARQLXMLSelectResultDoc( $outputArr );
 			return;
 		}
 
@@ -160,6 +161,9 @@ private function buildOptionsObj( $request, $queryByEquivURIs, $outputEquivURIs
 		$seOptions->queryByEquivUris = isset( $queryByEquivURIs ) ? $queryByEquivURIs : $request->getBool( 'equivuri_q' );
 		$seOptions->outputEquivUris = isset( $outputEquivURIs ) ? $outputEquivURIs : $request->getBool( 'equivuri_o' );
 		$seOptions->outputType = $request->getText( 'output' );
+		if ( $seOptions->outputType === '' ) {
+			$seOptions->outputType = 'sparqlresult'; // Default according to https://www.w3.org/TR/sparql11-protocol
+		}
 
 		if ( $seOptions->query != '' ) {
 			$result = $this->extractQueryInfosAndType( $seOptions->query );
@@ -470,7 +474,7 @@ private function getHTMLForm( $query = '' ) {
 				  <!-- <option value="php_ser" >Serialized PHP</option> -->
 				  <!-- <option value="turtle" >Turtle</option> -->
 				  <option value="htmltab" ' . $selOutputHTML . '>HTML</option>
-				  <option value="xml" >XML Resultset</option>
+				  <option value="sparqlresult" >SPARQL Resultset (XML)</option>
 				  <option value="rdfxml" ' . $selOutputRDFXML . '>RDF/XML</option>
 				  <!-- <option value="infos" >Query Structure</option> -->
 				  <!-- <option value="tsv" >TSV</option> -->