[DL-Learner SVN] SF.net SVN: dl-learner: [660] trunk/src/dl-learner/org/dllearner/kb/sparql

[<sk...@us...>]

Revision: 660
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=660&view=rev
Author:   sknappe
Date:     2008-02-28 05:56:42 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
fixed some bugs

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-02-27 19:03:22 UTC (rev 659)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-02-28 13:56:42 UTC (rev 660)
@@ -33,6 +33,7 @@
 import org.apache.log4j.Logger;
 
 import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFormatter;
 
 /**
  * SPARQL query cache to avoid possibly expensive multiple queries. The queries
@@ -217,13 +218,14 @@
 		if (result != null) {
 			return SparqlQuery.JSONtoResultSet(result);
 		} else {
-			ResultSet rs = query.send();
+			query.send();
+			ResultSet rs = query.getResultSet();
 			if (rs!=null){
 				String json = SparqlQuery.getAsJSON(rs);
 				addToCache(query.getQueryString(), json);
 				return SparqlQuery.JSONtoResultSet(json);
 			}
-			else return rs;
+			return rs;
 		}
 	}
 

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java	2008-02-27 19:03:22 UTC (rev 659)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java	2008-02-28 13:56:42 UTC (rev 660)
@@ -175,7 +175,7 @@
 		ResultSetFormatter.outputAsJSON(baos, resultSet);
 		// possible Jena bug: Jena modifies the result set during
 		// JSON transformation, so we need to get it back
-		//resultSet = JSONtoResultSet(baos.toString());
+		resultSet = JSONtoResultSet(baos.toString());
 		try{
 			return baos.toString("UTF-8");
 		}catch (Exception e){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.