You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/01/28 14:24:08 UTC
svn commit: r1439398 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java
jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
Author: andy
Date: Mon Jan 28 13:24:08 2013
New Revision: 1439398
URL: http://svn.apache.org/viewvc?rev=1439398&view=rev
Log:
Format text results for SELECT using prefixes in the query.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java?rev=1439398&r1=1439397&r2=1439398&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java Mon Jan 28 13:24:08 2013
@@ -153,6 +153,9 @@ public class Query extends Prologue impl
public boolean isUnknownType() { return queryType == QueryTypeUnknown ; }
+ // It was a mistake to extend Prologue ... but what is done is done.
+ public Prologue getPrologue() { return this ; }
+
public void setStrict(boolean isStrict)
{
strictQuery = isStrict ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1439398&r1=1439397&r2=1439398&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Mon Jan 28 13:24:08 2013
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
+import com.hp.hpl.jena.sparql.core.Prologue ;
/** This is the content negotiation for each kind of SPARQL query result */
public class ResponseResultSet
@@ -73,18 +74,19 @@ public class ResponseResultSet
public static void doResponseResultSet(Boolean booleanResult, HttpServletRequest request, HttpServletResponse response)
{
- doResponseResultSet$(null, booleanResult, request, response) ;
+ doResponseResultSet$(null, booleanResult, null, request, response) ;
}
- public static void doResponseResultSet(ResultSet resultSet, HttpServletRequest request, HttpServletResponse response)
+ public static void doResponseResultSet(ResultSet resultSet, Prologue qPrologue , HttpServletRequest request, HttpServletResponse response)
{
- doResponseResultSet$(resultSet, null, request, response) ;
+ doResponseResultSet$(resultSet, null, qPrologue, request, response) ;
}
// If we refactor the conneg into a single function, we can split boolean and result set handling.
// One or the other argument must be null
- private static void doResponseResultSet$(final ResultSet resultSet, final Boolean booleanResult, HttpServletRequest request, HttpServletResponse response)
+ private static void doResponseResultSet$(final ResultSet resultSet, final Boolean booleanResult, final Prologue qPrologue ,
+ HttpServletRequest request, HttpServletResponse response)
{
if ( resultSet == null && booleanResult == null )
{
@@ -172,7 +174,7 @@ public class ResponseResultSet
public void output(ServletOutputStream out)
{
if ( resultSet != null )
- ResultSetFormatter.out(out, resultSet) ;
+ ResultSetFormatter.out(out, resultSet, qPrologue) ;
if ( booleanResult != null )
ResultSetFormatter.out(out, booleanResult.booleanValue()) ;
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1439398&r1=1439397&r2=1439398&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Mon Jan 28 13:24:08 2013
@@ -52,6 +52,7 @@ import org.apache.jena.riot.WebContent ;
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.core.DatasetDescription ;
+import com.hp.hpl.jena.sparql.core.Prologue ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
public abstract class SPARQL_Query extends SPARQL_Protocol
@@ -251,7 +252,7 @@ public abstract class SPARQL_Query exten
Dataset dataset = decideDataset(action, query, queryStringLog) ;
qExec = createQueryExecution(query, dataset) ;
SPARQLResult result = executeQuery(action, qExec, query, queryStringLog) ;
- sendResults(action, result) ;
+ sendResults(action, result, query.getPrologue()) ;
} finally {
if ( qExec != null )
qExec.close() ;
@@ -340,10 +341,10 @@ public abstract class SPARQL_Query exten
protected abstract Dataset decideDataset(HttpActionQuery action, Query query, String queryStringLog) ;
- protected void sendResults(HttpActionQuery action, SPARQLResult result)
+ protected void sendResults(HttpActionQuery action, SPARQLResult result, Prologue qPrologue)
{
if ( result.isResultSet() )
- ResponseResultSet.doResponseResultSet(result.getResultSet(), action.request, action.response) ;
+ ResponseResultSet.doResponseResultSet(result.getResultSet(), qPrologue, action.request, action.response) ;
else if ( result.isGraph() )
ResponseModel.doResponseModel(result.getModel(), action.request, action.response) ;
else if ( result.isBoolean() )