address some todo's for ask/construct/describe queries and examples.

franzinc · Dec 11, 2009 · 5abf3fd · 5abf3fd
1 parent dd2dfc1
commit 5abf3fd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/src/com/franz/agraph/jena/AGQueryExecution.java b/src/com/franz/agraph/jena/AGQueryExecution.java
@@ -13,6 +13,7 @@
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.sparql.util.Context;
 import com.hp.hpl.jena.util.FileManager;
 
@@ -35,15 +36,14 @@ public void abort() {
 
 	@Override
 	public void close() {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
 	public boolean execAsk() {
 		AGBooleanQuery bq = model.getGraph().getConnection().prepareBooleanQuery(AGQueryLanguage.SPARQL, query.getQueryString());
 		boolean result;
 		try {
+			bq.setDataset(model.getGraph().getDataset());
 			result = bq.evaluate();
 		} catch (QueryEvaluationException e) {
 			throw new RuntimeException(e);
@@ -52,35 +52,42 @@ public boolean execAsk() {
 	}
 
 	@Override
-	public AGModel execConstruct() {
+	public Model execConstruct() {
+		return execConstruct(null);
+	}
+
+	@Override
+	public Model execConstruct(Model m) {
 		AGGraphQuery gq = model.getGraph().getConnection().prepareGraphQuery(AGQueryLanguage.SPARQL, query.getQueryString());
 		GraphQueryResult result;
 		try {
+			gq.setDataset(model.getGraph().getDataset());
 			result = gq.evaluate();
-			// TODO:
-			result.close();
 		} catch (QueryEvaluationException e) {
 			throw new RuntimeException(e);
 		}
-		return null; // TODO: new AGModel(result, model);
+		if (m==null) {
-	}
+			m = ModelFactory.createDefaultModel();
-
+		}
-	@Override
+		try {
-	public Model execConstruct(Model model) {
+			m.setNsPrefixes(result.getNamespaces());
-		// TODO Auto-generated method stub
+			while (result.hasNext()) {
-		return null;
+				m.add(model.asStatement(AGNodeFactory.asTriple(result.next())));
+			}
+		} catch (QueryEvaluationException e) {
+			throw new RuntimeException(e);
+		}
+		return m;
 	}
 
 	@Override
 	public Model execDescribe() {
-		// TODO Auto-generated method stub
+		return execDescribe(null);
-		return null;
 	}
 
 	@Override
-	public Model execDescribe(Model model) {
+	public Model execDescribe(Model m) {
-		// TODO Auto-generated method stub
+		return execConstruct(m);
-		return null;
 	}
 
 	@Override

diff --git a/src/tutorial/JenaTutorialExamples.java b/src/tutorial/JenaTutorialExamples.java
@@ -409,7 +409,7 @@ public static void example7() throws Exception {
 	public static void example8() throws Exception {
 		AGGraphMaker maker = example6();
 		AGModel model = new AGModel(maker.getGraph());
-		AGModel model_vcards = new AGModel(maker.openGraph("http://example.org#vcards"));
+		// TODO AGModel model_vcards = new AGModel(maker.openGraph("http://example.org#vcards"));
 		String outputFile = TEMPORARY_DIRECTORY + "temp.nt";
 		// outputFile = null;
 		if (outputFile == null) {
@@ -429,7 +429,7 @@ public static void example8() throws Exception {
 		}
 		output = (outputFile2 != null) ? new FileOutputStream(outputFile2)
 				: System.out;
-		model_vcards.write(output);
+		// TODO model_vcards.write(output);
 	}
 
 	/**
@@ -495,7 +495,6 @@ public static void example13() throws Exception {
 		} finally {
 			qe.close();
 		}
-		/*TODO:
 		queryString = "construct {?s ?p ?o} where { ?s ?p ?o . filter (?o = \"Alice\") } ";
         query = AGQueryFactory.create(queryString);
         qe = AGQueryExecutionFactory.create(query, model);
@@ -515,7 +514,7 @@ public static void example13() throws Exception {
 			m.write(System.out);
 		} finally {
 			qe.close();
-		}*/
+		}
 	}
 
 	/**