Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1025] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-07-30 06:53:40
|
Revision: 1025
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1025&view=rev
Author: kurzum
Date: 2008-07-30 06:53:34 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
more comments, renamed some simple functions, which is responsible for the changes in the most classes
Modified Paths:
--------------
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/Cache.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java
trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/test/JenaQueryToResultSpeedTest.java
trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQuery.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -99,7 +99,7 @@
// query.extraDebugInfo=uri.toString();
String JSON = cache.executeSparqlQuery(query);
- ResultSet rs = SparqlQuery.JSONtoResultSet(JSON);
+ ResultSet rs = SparqlQuery.convertJSONtoResultSet(JSON);
List<ResultBinding> l = ResultSetFormatter.toList(rs);
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/TypedSparqlQueryClasses.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -65,7 +65,7 @@
SparqlQuery query = new SparqlQuery(sparqlQueryString, configuration.getSparqlEndpoint());
// query.extraDebugInfo=uri.toString();
- ResultSet rs = SparqlQuery.JSONtoResultSet(cache.executeSparqlQuery(query));
+ ResultSet rs = SparqlQuery.convertJSONtoResultSet(cache.executeSparqlQuery(query));
List<ResultBinding> l = ResultSetFormatter.toList(rs);
for (ResultBinding resultBinding : l) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -82,18 +82,29 @@
this("cache");
} */
+ /**
+ * A Persistant cache is stored in the folder cachePersistant.
+ * It has longer freshness 365 days and is mainly usefull for developing
+ * @return a Cache onject
+ */
public static Cache getPersistentCache(){
Cache c = new Cache("cachePersistant");
c.setFreshnessInDays(365);
return c;
}
+ /**
+ * @return the default cache object
+ */
public static Cache getDefaultCache(){
Cache c = new Cache("cache");
-
return c;
}
+ /**
+ * the default cachedir normally is "cache".
+ * @return Default Cache Dir
+ */
public static String getDefaultCacheDir(){
return "cache";
}
@@ -146,17 +157,20 @@
*
* @param sparqlQuery
* SPARQL query to check.
- * @return Query result or null if no result has been found or it is
+ * @return Query result as JSON or null if no result has been found or it is
* outdated.
*/
@SuppressWarnings({"unchecked"})
private String getCacheEntry(String sparqlQuery) {
+
String filename = getFilename(sparqlQuery);
File file = new File(filename);
// return null (indicating no result) if file does not exist
- if(!file.exists())
+ if(!file.exists()) {
return null;
+ }
+
LinkedList<Object> entry = null;
try {
@@ -221,10 +235,7 @@
// check whether the given timestamp is fresh
private boolean checkFreshness(long timestamp) {
- if ((System.currentTimeMillis() - timestamp) <= (freshnessSeconds * 1000))
- return true;
- else
- return false;
+ return ((System.currentTimeMillis() - timestamp) <= (freshnessSeconds * 1000));
}
/**
@@ -242,7 +253,7 @@
JamonMonitorLogger.increaseCount(Cache.class, "TotalQueries");
JamonMonitorLogger.getTimeMonitor(Cache.class, "ReadTime").start();
- String result = getCacheEntry(query.getQueryString());
+ String result = getCacheEntry(query.getSparqlQueryString());
JamonMonitorLogger.getTimeMonitor(Cache.class, "ReadTime").stop();
if (result != null) {
@@ -250,8 +261,8 @@
query.setRunning(false);
SparqlQuery.writeToSparqlLog("***********\nJSON retrieved from cache");
- SparqlQuery.writeToSparqlLog(query.getQueryString());
- SparqlQuery.writeToSparqlLog(query.getEndpoint().getURL().toString());
+ SparqlQuery.writeToSparqlLog(query.getSparqlQueryString());
+ SparqlQuery.writeToSparqlLog(query.getSparqlEndpoint().getURL().toString());
SparqlQuery.writeToSparqlLog("JSON: "+result);
JamonMonitorLogger.increaseCount(Cache.class, "SuccessfulHits");
@@ -261,16 +272,15 @@
query.send();
String json = query.getJson();
if (json!=null){
- addToCache(query.getQueryString(), json);
+ addToCache(query.getSparqlQueryString(), json);
SparqlQuery.writeToSparqlLog("result added to cache: "+json);
result=json;
//query.setJson(result);
- }
- else {
+ } else {
json="";
result="";
- logger.warn(Cache.class.getSimpleName()+"empty result: "+query.getQueryString());
- SparqlQuery.writeToSparqlLog("empty result for : "+query.getQueryString());
+ logger.warn(Cache.class.getSimpleName()+"empty result: "+query.getSparqlQueryString());
+ SparqlQuery.writeToSparqlLog("empty result for : "+query.getSparqlQueryString());
}
//return json;
@@ -279,6 +289,10 @@
return result;
}
+ /**
+ * Changes how long cached results will stay fresh (default 15 days).
+ * @param days number of days
+ */
public void setFreshnessInDays(int days){
freshnessSeconds = days * 24 * 60 * 60;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SPARQLTasks.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -47,22 +47,22 @@
private final SparqlEndpoint sparqlEndpoint;
/**
- * @param c a cache object
- * @param se the Endpoint the sparql queries will be send to
+ * @param cache a cache object
+ * @param sparqlEndpoint the Endpoint the sparql queries will be send to
*/
- public SPARQLTasks(final Cache c, final SparqlEndpoint se) {
+ public SPARQLTasks(final Cache cache, final SparqlEndpoint sparqlEndpoint) {
super();
- this.cache = c;
- this.sparqlEndpoint = se;
+ this.cache = cache;
+ this.sparqlEndpoint = sparqlEndpoint;
}
/**
- * @param se the Endpoint the sparql queries will be send to
+ * @param sparqlEndpoint the Endpoint the sparql queries will be send to
*/
- public SPARQLTasks(final SparqlEndpoint se) {
+ public SPARQLTasks(final SparqlEndpoint sparqlEndpoint) {
super();
this.cache = null;
- this.sparqlEndpoint = se;
+ this.sparqlEndpoint = sparqlEndpoint;
}
/**
@@ -117,8 +117,6 @@
* @see conceptRewrite(String descriptionKBSyntax, SparqlEndpoint se, Cache
* c, boolean simple )
* @param description
- * @param sparqlEndpoint
- * @param cache
* @param simple
* @return
*/
@@ -175,10 +173,10 @@
* empty set on some endpoints. returns all direct subclasses of String
* concept
*
- * @param concept
+ * @param concept An URI string with no quotes
* @return SortedSet of direct subclasses as String
*/
- private SortedSet<String> getDirectSubClasses(final String concept) {
+ private SortedSet<String> getDirectSubClasses(String concept) {
String sparqlQueryString;
SortedSet<String> subClasses = new TreeSet<String>();
@@ -212,25 +210,31 @@
* QUALITY: buggy because role doesn't work sometimes get subject with fixed
* role and object
*
- * @param role
- * @param object
- * @param resultLimit
- * @return
+ * @param role An URI string with no quotes
+ * @param object An URI string with no quotes
+ * @param sparqlResultLimit Limits the ResultSet size
+ * @return SortedSet with the resulting subjects
*/
public SortedSet<String> retrieveDISTINCTSubjectsForRoleAndObject(
- String role, String object, int resultLimit) {
+ String role, String object, int sparqlResultLimit) {
String sparqlQueryString = "SELECT DISTINCT * WHERE { \n " + "?subject "
+ "<" + role + "> " + "<" + object + "> \n" + "} "
- + limit(resultLimit);
+ + limit(sparqlResultLimit);
return queryAsSet(sparqlQueryString, "subject");
}
+ /**
+ * @param subject An URI string with no quotes
+ * @param role An URI string with no quotes
+ * @param sparqlResultLimit Limits the ResultSet size
+ * @return
+ */
public SortedSet<String> retrieveObjectsForSubjectAndRole(String subject,
- String role, int resultLimit) {
+ String role, int sparqlResultLimit) {
String sparqlQueryString = "SELECT DISTINCT * WHERE { \n " + "<" + subject
+ "> " + "<" + role + "> " + " ?object \n" + "} LIMIT "
- + resultLimit;
+ + sparqlResultLimit;
return queryAsSet(sparqlQueryString, "object");
}
@@ -238,14 +242,14 @@
/**
* all instances for a SKOS concept.
*
- * @param skosConcept
- * @param resultLimit
+ * @param skosConcept An URI string with no quotes
+ * @param sparqlResultLimit Limits the ResultSet size
* @return
*/
public SortedSet<String> retrieveInstancesForSKOSConcept(
- String skosConcept, int resultLimit) {
+ String skosConcept, int sparqlResultLimit) {
return queryPatternAsSet("?subject", "?predicate", "<" + skosConcept
- + ">", "subject", resultLimit);
+ + ">", "subject", sparqlResultLimit);
// return
// retrieveDISTINCTSubjectsForRoleAndObject("http://www.w3.org/2004/02/skos/core#subject",
}
@@ -253,8 +257,8 @@
/**
* get all instances for a concept.
*
- * @param conceptKBSyntax
- * @param sparqlResultLimit
+ * @param conceptKBSyntax A description string in KBSyntax
+ * @param sparqlResultLimit Limits the ResultSet size
* @return
*/
public SortedSet<String> retrieveInstancesForConcept(
@@ -273,8 +277,8 @@
/**
* get all instances for a concept including RDFS Reasoning.
*
- * @param conceptKBSyntax
- * @param sparqlResultLimit
+ * @param conceptKBSyntax A description string in KBSyntax
+ * @param sparqlResultLimit Limits the ResultSet size
* @return
*/
public SortedSet<String> retrieveInstancesForConceptIncludingSubclasses(
@@ -295,15 +299,15 @@
/**
* get all direct Classes of an instance.
*
- * @param instance
- * @param resultLimit
+ * @param instance An URI string with no quotes
+ * @param sparqlResultLimit Limits the ResultSet size
* @return
*/
public SortedSet<String> getClassesForInstance(String instance,
- int resultLimit) {
+ int sparqlResultLimit) {
String sparqlQueryString = "SELECT ?subject WHERE { \n " + "<" + instance
- + ">" + " a " + "?subject " + "\n" + "} " + limit(resultLimit);
+ + ">" + " a " + "?subject " + "\n" + "} " + limit(sparqlResultLimit);
return queryAsSet(sparqlQueryString, "subject");
}
@@ -329,13 +333,15 @@
}
/**
- * query a pattern with a standard SPARQL query usage (?subject, ?predicate,
+ * //QUALITY rethink
+ * query a pattern with a standard SPARQL query.
+ * usage (?subject, <http://something>,
* <http://something> , subject ).
*
- * @param subject
- * @param predicate
- * @param object
- * @param var
+ * @param subject An URI string with no quotes
+ * @param predicate An URI string with no quotes
+ * @param object An URI string with no quotes
+ * @param var The single
* @return
*/
public SortedSet<String> queryPatternAsSet(String subject,
@@ -349,15 +355,15 @@
/**
* little higher level, executes query ,returns all resources for a variable.
*
- * @param sparqlQueryString
- * @param var
+ * @param sparqlQueryString The query
+ * @param var The single variable used in the query
* @return
*/
public SortedSet<String> queryAsSet(String sparqlQueryString, String var) {
ResultSet rs = null;
try {
String jsonString = query(sparqlQueryString);
- rs = SparqlQuery.JSONtoResultSet(jsonString);
+ rs = SparqlQuery.convertJSONtoResultSet(jsonString);
} catch (Exception e) {
logger.warn(e.getMessage());
@@ -368,18 +374,18 @@
/**
* low level, executes query returns ResultSet.
*
- * @param sparqlQueryString
+ * @param sparqlQueryString The query
* @return jena ResultSet
*/
public ResultSet queryAsResultSet(String sparqlQueryString) {
- return SparqlQuery.JSONtoResultSet(query(sparqlQueryString));
+ return SparqlQuery.convertJSONtoResultSet(query(sparqlQueryString));
}
/**
* low level, executes query returns JSON.
*
- * @param sparqlQueryString
+ * @param sparqlQueryString The query
* @return
*/
public String query(String sparqlQueryString) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -25,7 +25,7 @@
/**
* One sparql endpoint configuration,
- * made to comply with Jena
+ * made to comply with Jena.
*
* @author Sebastian Hellmann
*
@@ -42,7 +42,7 @@
this.namedGraphURIs=new LinkedList<String>();
}
- public SparqlEndpoint(URL u,List<String> defaultGraphURIs,List<String> namedGraphURIs) {
+ public SparqlEndpoint(URL u, List<String> defaultGraphURIs, List<String> namedGraphURIs) {
this.url = u;
this.defaultGraphURIs=defaultGraphURIs;
this.namedGraphURIs=namedGraphURIs;
@@ -86,57 +86,59 @@
name = name.toUpperCase();
- if (name.equals("DBPEDIA"))
- return EndpointDBpedia();
- if (name.equals("LOCALDBPEDIA"))
- return EndpointLOCALDBpedia();
- if (name.equals("LOCALJOSECKI"))
- return EndpointlocalJoseki();
- if (name.equals("GOVTRACK"))
- return EndpointGovTrack();
- if (name.equals("SPARQLETTE"))
- return EndpointSparqlette();
- if (name.equals("SWCONFERENCE"))
- return EndpointSWConference();
- if (name.equals("REVYU"))
- return EndpointRevyu();
- if (name.equals("MYOPENLINK"))
- return EndpointMyOpenlink();
- if (name.equals("FACTBOOK"))
- return EndpointWorldFactBook();
- if (name.equals("DBLP"))
- return EndpointDBLP();
- if (name.equals("MUSICBRAINZ"))
- return EndpointMusicbrainz();
- return null;
+ if (name.equals("DBPEDIA")) {
+ return getEndpointDBpedia();
+ } else if (name.equals("LOCALDBPEDIA")) {
+ return getEndpointLOCALDBpedia();
+ } else if (name.equals("LOCALJOSECKI")) {
+ return getEndpointlocalJoseki();
+ } else if (name.equals("GOVTRACK")) {
+ return getEndpointGovTrack();
+ } else if (name.equals("SPARQLETTE")) {
+ return getEndpointSparqlette();
+ } else if (name.equals("SWCONFERENCE")) {
+ return getEndpointSWConference();
+ } else if (name.equals("REVYU")) {
+ return getEndpointRevyu();
+ } else if (name.equals("MYOPENLINK")) {
+ return getEndpointMyOpenlink();
+ } else if (name.equals("FACTBOOK")) {
+ return getEndpointWorldFactBook();
+ } else if (name.equals("DBLP")) {
+ return getEndpointDBLP();
+ } else if (name.equals("MUSICBRAINZ")) {
+ return getEndpointMusicbrainz();
+ } else {
+ return null;
+ }
}
- public static LinkedList<SparqlEndpoint> listEndpoints() {
+ public static List<SparqlEndpoint> listEndpoints() {
LinkedList<SparqlEndpoint> ll =new LinkedList<SparqlEndpoint>();
- ll.add(EndpointDBLP());
- ll.add(EndpointDBpedia());
- ll.add(EndpointDOAPspace());
- ll.add(EndpointGovTrack());
- ll.add(EndpointJamendo());
- ll.add(EndpointJohnPeel());
- ll.add(EndpointlocalJoseki());
- ll.add(EndpointMagnaTune());
- ll.add(EndpointMusicbrainz());
- ll.add(EndpointMyOpenlink());
- ll.add(EndpointRevyu());
- ll.add(EndpointSWConference());
- ll.add(EndpointUSCensus());
- ll.add(EndpointWorldFactBook());
- ll.add(EndpointRiese());
- ll.add(EndpointTalisBlogs());
- ll.add(EndpointSWSchool());
- ll.add(EndpointSparqlette());
- ll.add(EndpointLOCALDBpedia());
+ ll.add(getEndpointDBLP());
+ ll.add(getEndpointDBpedia());
+ ll.add(getEndpointDOAPspace());
+ ll.add(getEndpointGovTrack());
+ ll.add(getEndpointJamendo());
+ ll.add(getEndpointJohnPeel());
+ ll.add(getEndpointlocalJoseki());
+ ll.add(getEndpointMagnaTune());
+ ll.add(getEndpointMusicbrainz());
+ ll.add(getEndpointMyOpenlink());
+ ll.add(getEndpointRevyu());
+ ll.add(getEndpointSWConference());
+ ll.add(getEndpointUSCensus());
+ ll.add(getEndpointWorldFactBook());
+ ll.add(getEndpointRiese());
+ ll.add(getEndpointTalisBlogs());
+ ll.add(getEndpointSWSchool());
+ ll.add(getEndpointSparqlette());
+ ll.add(getEndpointLOCALDBpedia());
return ll;
}
- public static SparqlEndpoint EndpointDBpedia() {
+ public static SparqlEndpoint getEndpointDBpedia() {
URL u = null;
try {
u = new URL("http://dbpedia.openlinksw.com:8890/sparql");
@@ -148,7 +150,7 @@
return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
}
- public static SparqlEndpoint EndpointLOCALDBpedia() {
+ public static SparqlEndpoint getEndpointLOCALDBpedia() {
URL u = null;
try {
u = new URL("http://139.18.2.37:8890/sparql");
@@ -160,7 +162,7 @@
return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
}
- public static SparqlEndpoint EndpointlocalJoseki() {
+ public static SparqlEndpoint getEndpointlocalJoseki() {
URL u = null;
try {
u = new URL("http://localhost:2020/books");
@@ -170,7 +172,7 @@
return new SparqlEndpoint(u, new LinkedList<String>(), new LinkedList<String>());
}
- public static SparqlEndpoint EndpointWorldFactBook() {
+ public static SparqlEndpoint getEndpointWorldFactBook() {
URL u = null;
try {
u = new URL("http://www4.wiwiss.fu-berlin.de/factbook/sparql");
@@ -181,7 +183,7 @@
}
- public static SparqlEndpoint EndpointGovTrack() {
+ public static SparqlEndpoint getEndpointGovTrack() {
URL u = null;
try {
u = new URL("http://www.rdfabout.com/sparql");
@@ -191,7 +193,7 @@
return new SparqlEndpoint(u, new LinkedList<String>(), new LinkedList<String>());
}
- public static SparqlEndpoint EndpointRevyu() {
+ public static SparqlEndpoint getEndpointRevyu() {
URL u = null;
try {
u = new URL("http://revyu.com/sparql");
@@ -201,7 +203,7 @@
return new SparqlEndpoint(u, new LinkedList<String>(), new LinkedList<String>());
}
- public static SparqlEndpoint EndpointMyOpenlink() {
+ public static SparqlEndpoint getEndpointMyOpenlink() {
URL u = null;
try {
u = new URL("http://myopenlink.net:8890/sparql/");
@@ -214,7 +216,7 @@
}
- public static SparqlEndpoint EndpointDOAPspace() {
+ public static SparqlEndpoint getEndpointDOAPspace() {
URL u = null;
try {
u = new URL("http://doapspace.org/sparql");
@@ -226,7 +228,7 @@
}
- public static SparqlEndpoint EndpointJohnPeel() {
+ public static SparqlEndpoint getEndpointJohnPeel() {
URL u = null;
try {
u = new URL("http://dbtune.org:3030/sparql/");
@@ -240,7 +242,7 @@
- public static SparqlEndpoint EndpointSWConference() {
+ public static SparqlEndpoint getEndpointSWConference() {
URL u = null;
try {
u = new URL("http://data.semanticweb.org:8080/openrdf-sesame/repositories/SWC");
@@ -275,7 +277,7 @@
return new SpecificSparqlEndpoint(u, "dbtune.org", m);
}*/
- public static SparqlEndpoint EndpointJamendo() {
+ public static SparqlEndpoint getEndpointJamendo() {
URL u = null;
try {
u = new URL("http://dbtune.org:2105/sparql/");
@@ -287,7 +289,7 @@
- public static SparqlEndpoint EndpointMagnaTune() {
+ public static SparqlEndpoint getEndpointMagnaTune() {
URL u = null;
try {
u = new URL("http://dbtune.org:2020/sparql/");
@@ -298,7 +300,7 @@
}
- public static SparqlEndpoint EndpointMusicbrainz() {
+ public static SparqlEndpoint getEndpointMusicbrainz() {
URL u = null;
try {
u = new URL("http://dbtune.org/musicbrainz/sparql");
@@ -308,7 +310,7 @@
return new SparqlEndpoint(u);
}
- public static SparqlEndpoint EndpointRiese() {
+ public static SparqlEndpoint getEndpointRiese() {
URL u = null;
try {
u = new URL("http://riese.joanneum.at:3020/");
@@ -319,7 +321,7 @@
}
- public static SparqlEndpoint EndpointUSCensus() {
+ public static SparqlEndpoint getEndpointUSCensus() {
URL u = null;
try {
u = new URL("http://www.rdfabout.com/sparql");
@@ -337,7 +339,7 @@
/*
* it only has 4 classes
*/
- public static SparqlEndpoint EndpointDBLP() {
+ public static SparqlEndpoint getEndpointDBLP() {
URL u = null;
try {
u = new URL("http://www4.wiwiss.fu-berlin.de/dblp/sparql");
@@ -348,7 +350,7 @@
}
- public static SparqlEndpoint EndpointTalisBlogs() {
+ public static SparqlEndpoint getEndpointTalisBlogs() {
URL u = null;
try {
u = new URL("http://api.talis.com/stores/talisians/services/sparql");
@@ -358,7 +360,7 @@
return new SparqlEndpoint(u);
}
- public static SparqlEndpoint EndpointSparqlette() {
+ public static SparqlEndpoint getEndpointSparqlette() {
URL u = null;
try {
u = new URL("http://www.wasab.dk/morten/2005/04/sparqlette/");
@@ -370,7 +372,7 @@
- public static SparqlEndpoint EndpointSWSchool() {
+ public static SparqlEndpoint getEndpointSWSchool() {
URL u = null;
try {
u = new URL("http://sparql.semantic-web.at/snorql/");
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -118,7 +118,7 @@
.getLogger(SparqlKnowledgeSource.class);
/**
- * sets the ConfigOptions for this KnowledgeSource
+ * sets the ConfigOptions for this KnowledgeSource.
*
* @return
*/
@@ -195,7 +195,7 @@
* @see org.dllearner.core.Component#applyConfigEntry(org.dllearner.core.ConfigEntry)
*/
@Override
- @SuppressWarnings( { "unchecked" })
+ @SuppressWarnings({ "unchecked" })
public <T> void applyConfigEntry(ConfigEntry<T> entry)
throws InvalidConfigOptionValueException {
String option = entry.getOptionName();
@@ -348,9 +348,10 @@
String filename = System.currentTimeMillis() + ".nt";
String basedir = "cache" + File.separator;
try {
- if (!new File(basedir).exists())
+ if (!new File(basedir).exists()) {
new File(basedir).mkdir();
-
+ }
+
FileWriter fw = new FileWriter(
new File(basedir + filename), true);
fw.write(ont);
@@ -441,7 +442,7 @@
return dumpFile;
}
- public boolean getUseCache(){
+ public boolean isUseCache(){
return useCache;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -49,50 +49,48 @@
private boolean wasExecuted = false;
- private String queryString;
+ private String sparqlQueryString;
private QueryEngineHTTP queryExecution;
- private SparqlEndpoint endpoint;
+ private SparqlEndpoint sparqlEndpoint;
private String json = null;
/**
* Standard constructor.
*
- * @param queryString
- * @param endpoint
+ * @param sparqlQueryString A SPARQL query string
+ * @param sparqlEndpoint An Endpoint object
*/
- public SparqlQuery(String queryString, SparqlEndpoint endpoint) {
+ public SparqlQuery(String sparqlQueryString, SparqlEndpoint sparqlEndpoint) {
// QUALITY there seems to be a bug in ontowiki
- this.queryString = queryString.replaceAll("\n", " ");
- this.endpoint = endpoint;
+ this.sparqlQueryString = sparqlQueryString.replaceAll("\n", " ");
+ this.sparqlEndpoint = sparqlEndpoint;
}
/**
* Sends a SPARQL query using the Jena library. main format is JSON, use
* method getasjson
*
- * @return nothing
*/
-
public void send() {
wasExecuted = true;
// isRunning = true;
ResultSet rs;
writeToSparqlLog("***********\nNew Query:");
- writeToSparqlLog(queryString);
- writeToSparqlLog(endpoint.getURL().toString());
+ writeToSparqlLog(sparqlQueryString);
+ writeToSparqlLog(sparqlEndpoint.getURL().toString());
- String service = endpoint.getURL().toString();
+ String service = sparqlEndpoint.getURL().toString();
// Jena access to SPARQL endpoint
- queryExecution = new QueryEngineHTTP(service, queryString);
- for (String dgu : endpoint.getDefaultGraphURIs()) {
+ queryExecution = new QueryEngineHTTP(service, sparqlQueryString);
+ for (String dgu : sparqlEndpoint.getDefaultGraphURIs()) {
queryExecution.addDefaultGraph(dgu);
}
- for (String ngu : endpoint.getNamedGraphURIs()) {
+ for (String ngu : sparqlEndpoint.getNamedGraphURIs()) {
queryExecution.addNamedGraph(ngu);
}
@@ -108,12 +106,12 @@
rs = queryExecution.execSelect();
JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").stop();
- logger.debug("query length: " + queryString.length() + " | ENDPOINT: "
- + endpoint.getURL().toString());
+ logger.debug("query length: " + sparqlQueryString.length() + " | ENDPOINT: "
+ + sparqlEndpoint.getURL().toString());
// writeToSparqlLog("query: "+queryString+ " | ENDPOINT:
// "+endpoint.getURL().toString());
- json = SparqlQuery.getAsJSON(rs);
+ json = SparqlQuery.convertResultSetToJSON(rs);
writeToSparqlLog("JSON: " + json);
@@ -121,90 +119,129 @@
}
+ /**
+ * Stops the execution of the query.
+ */
public void stop() {
queryExecution.abort();
isRunning = false;
}
- public String getQueryString() {
- return queryString;
+ /**
+ * Gets the String representation of the SPARQL query.
+ * @return sparqlQueryString
+ */
+ public String getSparqlQueryString() {
+ return sparqlQueryString;
}
- public SparqlEndpoint getEndpoint() {
- return endpoint;
+ /**
+ * @return sparqlEndpoint object
+ */
+ public SparqlEndpoint getSparqlEndpoint() {
+ return sparqlEndpoint;
}
+ /**
+ *
+ * @return boolean
+ */
public boolean isRunning() {
return isRunning;
}
+ /**
+ * @return the Jena QueryEngineHTTP
+ */
public QueryEngineHTTP getExecution() {
return queryExecution;
}
+ /**
+ * insert a result, e.g. from the cache
+ * @param json a jsonString
+ */
public void setJson(String json) {
this.wasExecuted = true;
this.json = json;
}
+ /**
+ * @param running s.e.
+ */
public void setRunning(boolean running) {
this.isRunning = running;
}
/**
* returns the Result of the query as JSON string executes the query if it
- * wasn't executed before
+ * wasn't executed before.
*
- * @return
+ * @return a JSON string
*/
public String getJson() {
- if (wasExecuted == false) {
+ if (!wasExecuted) {
this.send();
}
return json;
}
/**
- * makes a ResultSet from the Json String, depends on getJSON
+ * makes a ResultSet from the Json String, depends on getJSON.
*
- * @return
+ * @return a Jena ResultSet
*/
public ResultSet getResultSet() {
- if (getJson() == null) {
- return null;
+ return (getJson() == null) ? null : convertJSONtoResultSet(json);
+
+ /*if (getJson() == null) {
+ return null;
} else
- return JSONtoResultSet(json);
+ return JSONtoResultSet(json);*/
}
/**
- * makes an XML String from the Json String, depends on getJSON
+ * makes an XML String from the Json String, depends on getJSON.
*
- * @return
+ * @return An XML String
*/
public String getXMLString() {
- if (getJson() == null) {
+ return (getJson() == null) ? null : convertJSONtoXML(json);
+
+ /*if (getJson() == null) {
return null;
} else
- return JSONtoXML(json);
+ return JSONtoXML(json);*/
}
+ /**
+ * Special log for debugging SPARQL query execution.
+ * It lives here: "log/sparql.txt"
+ * if the directory doesn't exist, there could be an error.
+ * @param s the String to log
+ */
public static void writeToSparqlLog(String s) {
try {
+ //
FileWriter fw = new FileWriter("log/sparql.txt", true);
fw.write(s + "\n");
fw.flush();
fw.close();
} catch (Exception e) {
e.printStackTrace();
+ // make the e object more special FileNotFound??
+ //new File("log").mkdir();
+ //writeToSparqlLog(s);
}
}
+
/**
* Converts Jena result set to XML.
- *
+ * @param resultSet a Jena ResultSet
* @return String xml
*/
- public static String getAsXMLString(ResultSet resultSet) {
+ public static String convertResultSetToXMLString(ResultSet resultSet) {
// if (rs == null)
// this.send();
return ResultSetFormatter.asXMLString(resultSet);
@@ -217,14 +254,14 @@
* The result set to transform.
* @return JSON representation of the result set.
*/
- public static String getAsJSON(ResultSet resultSet) {
+ public static String convertResultSetToJSON(ResultSet resultSet) {
// if (rs == null)
// this.send();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
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 = convertJSONtoResultSet(baos.toString());
try {
return baos.toString("UTF-8");
} catch (UnsupportedEncodingException e) {
@@ -240,7 +277,7 @@
* A JSON representation if a SPARQL query result.
* @return A Jena ResultSet.
*/
- public static ResultSet JSONtoResultSet(String json) {
+ public static ResultSet convertJSONtoResultSet(String json) {
ByteArrayInputStream bais = new ByteArrayInputStream(json
.getBytes(Charset.forName("UTF-8")));
// System.out.println("JSON " + json);
@@ -254,7 +291,7 @@
* A JSON representation if a SPARQL query result.
* @return A Jena ResultSet.
*/
- public static String JSONtoXML(String json) {
- return getAsXMLString(JSONtoResultSet(json));
+ public static String convertJSONtoXML(String json) {
+ return convertResultSetToXMLString(convertJSONtoResultSet(json));
}
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -111,28 +111,18 @@
// String resultString="";
// System.out.println(time());
// System.out.println(System.currentTimeMillis());
- String[] a = new String[2];
- int x1=0;
- try {
- while(true)
- a[x1++]="";
- } catch (Exception e) {
- e.printStackTrace();
-
- }
- System.exit(0);
// parameters
if (local) {
url = "http://139.18.2.37:8890/sparql";
sparqlTasks = new SPARQLTasks(Cache.getPersistentCache(),
- SparqlEndpoint.EndpointLOCALDBpedia());
+ SparqlEndpoint.getEndpointLOCALDBpedia());
} else {
url = "http://dbpedia.openlinksw.com:8890/sparql";
sparqlTasks = new SPARQLTasks(Cache.getPersistentCache(),
- SparqlEndpoint.EndpointDBpedia());
+ SparqlEndpoint.getEndpointDBpedia());
}
//System.out.println(sparqlTasks.getDomain(
Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -61,12 +61,12 @@
SimpleClock total =new SimpleClock();
String url="";
if(local){
- se = SparqlEndpoint.EndpointLOCALDBpedia();
+ se = SparqlEndpoint.getEndpointLOCALDBpedia();
url = "http://139.18.2.37:8890/sparql";
}else{
- se = SparqlEndpoint.EndpointDBpedia();
+ se = SparqlEndpoint.getEndpointDBpedia();
url= "http://dbpedia.openlinksw.com:8890/sparql";
}
@@ -187,7 +187,7 @@
" \n} LIMIT "+1000+" \n "; //
String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
+ ResultSet rs =SparqlQuery.convertJSONtoResultSet(JSON);
if(rs==null);
//JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
//return SetManipulation.fuzzyShrink(rsc.getStringListForVariable("concept"),number);
Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -97,7 +97,7 @@
static void roles(){
- se = SparqlEndpoint.EndpointDBpedia();
+ se = SparqlEndpoint.getEndpointDBpedia();
//se = SparqlEndpoint.EndpointUSCensus();
SortedSet<String> roles = new TreeSet<String>();
roles.add("http://dbpedia.org/property/birthPlace");
@@ -143,7 +143,7 @@
}
static void DBpedia(){
- se = SparqlEndpoint.EndpointLOCALDBpedia();
+ se = SparqlEndpoint.getEndpointLOCALDBpedia();
//concepts.add("(EXISTS \"monarch\".TOP AND EXISTS \"predecessor\".(\"Knight\" OR \"Secretary\"))");
SortedSet<String> concepts = new TreeSet<String>();
@@ -257,7 +257,7 @@
String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
- ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
+ ResultSet rs =SparqlQuery.convertJSONtoResultSet(JSON);
if(rs==null);
//JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
//return SetManipulation.fuzzyShrink(rsc.getStringListForVariable("concept"),number);
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -599,7 +599,7 @@
Thread sparqlThread = new Thread() {
@Override
public void run() {
- if (ks.getUseCache()){
+ if (ks.isUseCache()){
state.getQuery(id).setRunning(true);
Cache cache=new Cache(ks.getCacheDir());
cache.executeSparqlQuery(state.getQuery(id));
@@ -623,7 +623,7 @@
Component component = state.getComponent(componentID);
SparqlKnowledgeSource ks=(SparqlKnowledgeSource)component;
SparqlQuery sparql=ks.sparqlQuery(query);
- if (ks.getUseCache()){
+ if (ks.isUseCache()){
Cache cache=new Cache(ks.getCacheDir());
return cache.executeSparqlQuery(sparql);
}
Modified: trunk/src/dl-learner/org/dllearner/test/JenaQueryToResultSpeedTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/JenaQueryToResultSpeedTest.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/test/JenaQueryToResultSpeedTest.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -50,7 +50,7 @@
public static void testJenaAsXML(int howOften, String queryString){
- SparqlEndpoint sse = SparqlEndpoint.EndpointDBpedia();
+ SparqlEndpoint sse = SparqlEndpoint.getEndpointDBpedia();
SparqlQuery sqJena = new SparqlQuery(queryString, sse);
// first query is not counted
sqJena.send();
@@ -72,7 +72,7 @@
}
public static void testJenaAsList(int howOften, String queryString){
- SparqlEndpoint sse = SparqlEndpoint.EndpointDBpedia();
+ SparqlEndpoint sse = SparqlEndpoint.getEndpointDBpedia();
SparqlQuery sqJena = new SparqlQuery(queryString, sse);
// first query is not counted
//sqJena.getAsList();
@@ -96,7 +96,7 @@
}
public static void testJenaAsJSON(int howOften, String queryString){
- SparqlEndpoint sse = SparqlEndpoint.EndpointDBpedia();
+ SparqlEndpoint sse = SparqlEndpoint.getEndpointDBpedia();
SparqlQuery sqJena = new SparqlQuery(queryString, sse);
// first query is not counted
sqJena.send();
@@ -119,7 +119,7 @@
}
public static void testJenaAsJSONandBack(int howOften, String queryString){
- SparqlEndpoint sse = SparqlEndpoint.EndpointDBpedia();
+ SparqlEndpoint sse = SparqlEndpoint.getEndpointDBpedia();
SparqlQuery sqJena = new SparqlQuery(queryString, sse);
// first query is not counted
sqJena.send();
@@ -131,7 +131,7 @@
// System.out.println(sqJena.getAsJSON());
sqJena.send();
String json = sqJena.getJson();
- SparqlQuery.JSONtoResultSet(json);
+ SparqlQuery.convertJSONtoResultSet(json);
p("Jena as JSON and back needed: "
+ (System.currentTimeMillis() - tmp));
tmp = System.currentTimeMillis();
@@ -145,7 +145,7 @@
public static void compareResults(String queryString) {
- SparqlEndpoint sse = SparqlEndpoint.EndpointDBpedia();
+ SparqlEndpoint sse = SparqlEndpoint.getEndpointDBpedia();
SparqlQuery sqJena = new SparqlQuery(queryString, sse);
// SparqlQueryConventional sqConv=new SparqlQueryConventional(sse);
Modified: trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java 2008-07-29 14:30:25 UTC (rev 1024)
+++ trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java 2008-07-30 06:53:34 UTC (rev 1025)
@@ -1,7 +1,7 @@
package org.dllearner.test;
import java.util.HashSet;
-import java.util.LinkedList;
+import java.util.List;
import java.util.Set;
import java.util.SortedSet;
@@ -36,7 +36,7 @@
//SELECT DISTINCT ?c WHERE {[] a ?c }LIMIT 100
- LinkedList<SparqlEndpoint> ll = SparqlEndpoint.listEndpoints();
+ List<SparqlEndpoint> ll = SparqlEndpoint.listEndpoints();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
