let rdf.sparqlConstructRemote return a Jena Model instead of (RDF/XML…

…) String
samuell · Sep 16, 2010 · bf7473f · egonw · Sep 16, 2010 · samuell
1 parent 2d2ea69
commit bf7473f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/plugins/net.bioclipse.rdf/src/net/bioclipse/rdf/business/IRDFManager.java b/plugins/net.bioclipse.rdf/src/net/bioclipse/rdf/business/IRDFManager.java
@@ -27,6 +27,8 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
+import com.hp.hpl.jena.rdf.model.Model;
+
 @PublishedClass("Contains RDF related methods")
 @TestClasses(
     "net.bioclipse.rdf.tests.APITest," +
@@ -195,7 +197,7 @@ public IStringMatrix sparqlRemote(String url, String SPARQL)
         		        "Assumes that the query is creating an RDF graph with the " +
         		        "CONSTRUCT keyword"
     )
-    public String sparqlConstructRemote(String url, String SPARQL)
+    public Model sparqlConstructRemote(String url, String SPARQL)
         throws BioclipseException;
 
     @Recorded

diff --git a/plugins/net.bioclipse.rdf/src/net/bioclipse/rdf/business/RDFManager.java b/plugins/net.bioclipse.rdf/src/net/bioclipse/rdf/business/RDFManager.java
@@ -383,29 +383,27 @@ public StringMatrix sparqlRemote(
         return table;
     }
 
-    public String sparqlConstructRemote(
-            String serviceURL,
-            String sparqlQueryString, IProgressMonitor monitor) {
-         if (monitor == null)
-             monitor = new NullProgressMonitor();
-
-         monitor.beginTask("Sparqling the remote service..", 100);
-         Query query = QueryFactory.create(sparqlQueryString);
-         QueryExecution qexec = QueryExecutionFactory.sparqlService(serviceURL, query);
-         monitor.worked(80);
-
-         String rdfxml = "";
-         try {
-             Model results = qexec.execConstruct();
-             StringWriter sw = new StringWriter();
-             results.write(sw, "RDF/XML");             
-             rdfxml = sw.toString();
-         } finally {
-             qexec.close();
-         }
-         monitor.worked(20);
-         return rdfxml;
-     }
+    public Model sparqlConstructRemote(
+    		String serviceURL,
+    		String sparqlQueryString, IProgressMonitor monitor) {
+
+    	if (monitor == null)
+    		monitor = new NullProgressMonitor();
+    	Model results = null;
+
+    	monitor.beginTask("Sparqling the remote service..", 100);
+    	Query query = QueryFactory.create(sparqlQueryString);
+    	QueryExecution qexec = QueryExecutionFactory.sparqlService(serviceURL, query);
+    	monitor.worked(80);
+
+    	try {
+    		results = qexec.execConstruct();
+    	} finally {
+    		qexec.close();
+    	}
+    	monitor.worked(20);
+    	return results;
+    }
 
     public IRDFStore importRDFa(IRDFStore store, String url,
             IProgressMonitor monitor)