svn commit: r1497729 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets: SPARQL_REST.java SPARQL_REST_R.java

[an...@apache.org]

Author: andy
Date: Fri Jun 28 10:56:32 2013
New Revision: 1497729

URL: http://svn.apache.org/r1497729
Log:
Use plain RDF/XML for GSP GET.

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1497729&r1=1497728&r2=1497729&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Fri Jun 28 10:56:32 2013
@@ -330,19 +330,6 @@ public abstract class SPARQL_REST extend
         {
             Target dest = determineTarget(action) ;
             FusekiLib.addDataInto(data, dest.dsg, dest.graphName) ;
-            
-//            Graph g = dest.graph() ;
-//            
-//            if (g == null)
-//            {
-//                if (dest.isDefault) errorOccurred("Dataset does not have a default graph") ;
-//                log.info(format("[%d] Creating in-memory graph for <%s>", action.id, dest.graphName)) ;
-//                // Not default graph.
-//                // Not an autocreate dataset - create something.
-//                g = GraphFactory.createDefaultGraph() ;
-//                dest.dsg.addGraph(dest.graphName, g) ;
-//            }
-//            GraphUtil.addInto(g, data) ;
         } catch (RuntimeException ex)
         {
             // If anything went wrong, try to backout.

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1497729&r1=1497728&r2=1497729&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Fri Jun 28 10:56:32 2013
@@ -27,9 +27,7 @@ import javax.servlet.ServletOutputStream
 import org.apache.jena.atlas.web.MediaType ;
 import org.apache.jena.atlas.web.TypedOutputStream ;
 import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.* ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.rdf.model.Model ;
@@ -64,7 +62,7 @@ public class SPARQL_REST_R extends SPARQ
 
         if ( action.verbose )
             log.info(format("[%d]   Get: Content-Type=%s, Charset=%s => %s", 
-                                  action.id, mediaType.getContentType(), mediaType.getCharset(), lang.getName())) ;
+                            action.id, mediaType.getContentType(), mediaType.getCharset(), lang.getName())) ;
 
         action.beginRead() ;
 
@@ -81,7 +79,11 @@ public class SPARQL_REST_R extends SPARQ
             action.response.setContentType(ct) ;
             Graph g = target.graph() ;
             Model model = ModelFactory.createModelForGraph(g) ;
-            RDFDataMgr.write(out, model, lang) ;
+            
+            //Special case RDF/XML to be the plain (faster, less readable) form
+            RDFFormat fmt = 
+                ( lang == Lang.RDFXML ) ? RDFFormat.RDFXML_PLAIN : RDFWriterRegistry.defaultSerialization(lang) ;  
+            RDFDataMgr.write(out, model, fmt) ;
             success(action) ;
         } finally { action.endRead() ; }
     }