Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [938] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-06-04 12:07:51
|
Revision: 938
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=938&view=rev
Author: jenslehmann
Date: 2008-06-04 05:07:48 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
removed black hole for exceptions in SparqlQuery
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
trunk/src/dl-learner/org/dllearner/cli/Start.java
trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
trunk/src/dl-learner/org/dllearner/scripts/PaperStatistics.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.dllearner.core.ReasoningService;
import org.dllearner.core.Score;
import org.dllearner.core.config.BooleanConfigOption;
Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -70,7 +70,6 @@
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.kb.KBFile;
import org.dllearner.kb.OWLFile;
-import org.dllearner.kb.extraction.TypedSparqlQuery;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
import org.dllearner.learningproblems.PosNegDefinitionLP;
import org.dllearner.learningproblems.PosNegInclusionLP;
@@ -85,7 +84,6 @@
import org.dllearner.reasoning.OWLAPIReasoner;
import org.dllearner.utilities.Files;
import org.dllearner.utilities.Helper;
-import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.datastructures.Datastructures;
import org.dllearner.utilities.datastructures.StringTuple;
import org.dllearner.utilities.owl.ConceptComparator;
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -96,7 +96,7 @@
// .getSparqlEndpoint(), cache, uri.toString(), sparqlQueryString);
SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
- query.extraDebugInfo=uri.toString();
+// query.extraDebugInfo=uri.toString();
String JSON = cache.executeSparqlQuery(query);
ResultSet rs = SparqlQuery.JSONtoResultSet(JSON);
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -64,7 +64,7 @@
+ "}";
SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
- query.extraDebugInfo=uri.toString();
+// query.extraDebugInfo=uri.toString();
ResultSet rs = SparqlQuery.JSONtoResultSet(cache.executeSparqlQuery(query));
List<ResultBinding> l = ResultSetFormatter.toList(rs);
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -353,7 +353,7 @@
public String query(String SPARQLquery){
if(c==null){
SparqlQuery sq = new SparqlQuery(SPARQLquery,se);
- sq.extraDebugInfo+=se.getURL();
+// sq.extraDebugInfo+=se.getURL();
sq.send();
String JSON = sq.getResult();
return JSON;
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -21,6 +21,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import org.apache.log4j.Logger;
@@ -44,13 +45,12 @@
private static Logger logger = Logger.getLogger(KnowledgeSource.class);
- public String extraDebugInfo = "";
private boolean isRunning = false;
private String queryString;
private QueryEngineHTTP queryExecution;
private SparqlEndpoint endpoint;
private String json = null;
- private SparqlQueryException sendException=null;
+// private SparqlQueryException sendException=null;
/**
* Standard constructor.
@@ -83,25 +83,24 @@
queryExecution.addNamedGraph(ngu);
}
- try{
- //TODO remove after overnext Jena release
- HttpQuery.urlLimit = 3*1024 ;
+ //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();
+ JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").start();
+ rs = queryExecution.execSelect();
+ JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").stop();
- logger.debug("query SPARQL server ["+extraDebugInfo+"], retrieved: "+rs.getResultVars());
- json=SparqlQuery.getAsJSON(rs);
+ logger.debug("query SPARQL server, retrieved: "+rs.getResultVars());
+ json=SparqlQuery.getAsJSON(rs);
- logger.trace(rs.getResultVars().toString());
- } catch (Exception e){
- sendException=new SparqlQueryException(e.getMessage());
- logger.debug(e.getMessage());
- //e.printStackTrace();
- logger.debug("Exception when querying Sparql Endpoint in " + this.getClass());
- logger.debug(queryString);
- }
+ logger.trace(rs.getResultVars().toString());
+// } catch (Exception e){
+// sendException=new SparqlQueryException(e.getMessage());
+// logger.debug(e.getMessage());
+// //e.printStackTrace();
+// logger.debug("Exception when querying Sparql Endpoint in " + this.getClass());
+// logger.debug(queryString);
+// }
isRunning = false;
return rs;
}
@@ -130,9 +129,9 @@
return queryExecution;
}
- public SparqlQueryException getException(){
- return sendException;
- }
+// public SparqlQueryException getException(){
+// return sendException;
+// }
public boolean hasCompleted() {
return (json != null);
@@ -163,10 +162,11 @@
// possible Jena bug: Jena modifies the result set during
// JSON transformation, so we need to get it back
resultSet = JSONtoResultSet(baos.toString());
- try{
+ try {
return baos.toString("UTF-8");
- }catch (Exception e){
- return baos.toString();
+ } catch (UnsupportedEncodingException e) {
+ // should never happen as UTF-8 is supported
+ throw new Error(e);
}
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/PaperStatistics.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/PaperStatistics.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/scripts/PaperStatistics.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -29,7 +29,6 @@
import org.dllearner.algorithms.gp.GP;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
-import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.OntologyFormat;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.ReasoningService;
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-06-04 11:50:54 UTC (rev 937)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-06-04 12:07:48 UTC (rev 938)
@@ -302,25 +302,17 @@
* method will block until learning is completed.
*
* @param id Session ID.
+ * @param format The format of the result string: "manchester", "kb", "dl".
* @return The best solution found.
* @throws ClientNotKnownException
- */
+ */
@WebMethod
- public String learn(int id) throws ClientNotKnownException {
- ClientState state = getState(id);
- state.getLearningAlgorithm().start();
- return state.getLearningAlgorithm().getBestSolution().toString();
- }
-
- @WebMethod
public String learn(int id, String format) throws ClientNotKnownException {
ClientState state = getState(id);
state.getLearningAlgorithm().start();
- // ResultSet resultSet=SparqlQuery.JSONtoResultSet(state.getQuery(id).getResult());
Description solution = state.getLearningAlgorithm().getBestSolution();
if(format == "manchester")
- return solution.toManchesterSyntaxString(state.getReasoningService().getBaseURI(), new HashMap<String,String>()).
- replace("\"", "");
+ return solution.toManchesterSyntaxString(state.getReasoningService().getBaseURI(), new HashMap<String,String>());
else if(format == "kb")
return solution.toKBSyntaxString();
else
@@ -528,8 +520,6 @@
public String getAsJSON(int sessionID, int queryID) throws ClientNotKnownException, SparqlQueryException
{
ClientState state = getState(sessionID);
- SparqlQueryException exception=null;
- if ((exception=state.getQuery(queryID).getSparqlQuery().getException())!=null) throw exception;
return state.getQuery(queryID).getResult();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
