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

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

Revision: 972
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=972&view=rev
Author:   sknappe
Date:     2008-06-18 11:26:41 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
changed to work without SparqlQueryThreaded

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

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-06-18 18:25:58 UTC (rev 971)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-06-18 18:26:41 UTC (rev 972)
@@ -265,6 +265,7 @@
 			if (json!=null){
 				addToCache(query.getQueryString(), json);
 				result=json;
+				query.setJson(result);
 			}
 			else {
 				json="";

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java	2008-06-18 18:25:58 UTC (rev 971)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java	2008-06-18 18:26:41 UTC (rev 972)
@@ -23,11 +23,13 @@
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.util.Iterator;
 
 import org.apache.log4j.Logger;
 import org.dllearner.core.KnowledgeSource;
 import org.dllearner.utilities.JamonMonitorLogger;
 
+import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.query.ResultSetFactory;
 import com.hp.hpl.jena.query.ResultSetFormatter;
@@ -69,7 +71,7 @@
 	 */
 	public ResultSet send() {
 		
-		isRunning = true;
+		//isRunning = true;
 		logger.trace(queryString);
 		
 		String service = endpoint.getURL().toString();
@@ -85,11 +87,10 @@
 		
 		//TODO remove after overnext Jena release
 		HttpQuery.urlLimit = 3*1024 ;
-			
 		JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").start();
 		rs = queryExecution.execSelect();
 		JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").stop();
-			
+				
 		logger.debug("query SPARQL server, retrieved: "+rs.getResultVars());
 				
 		logger.trace(rs.getResultVars().toString());
@@ -100,7 +101,7 @@
 //			logger.debug("Exception when querying Sparql Endpoint in " + this.getClass());
 //			logger.debug(queryString);
 //		}
-		isRunning = false;
+		//isRunning = false;
 		return rs;
 	}
 

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-06-18 18:25:58 UTC (rev 971)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-06-18 18:26:41 UTC (rev 972)
@@ -552,8 +552,13 @@
 					state.getQuery(id).setRunning(true);
 					Cache cache=new Cache(ks.getCacheDir());
 					cache.executeSparqlQuery(state.getQuery(id));
+					state.getQuery(id).setRunning(false);
 				}
-				else state.getQuery(id).send();
+				else{
+					state.getQuery(id).setRunning(true);
+					state.getQuery(id).send();
+					state.getQuery(id).setRunning(false);
+				}
 			}
 		};
 		sparqlThread.start();


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