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

[<Jen...@us...>]

Revision: 1472
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1472&view=rev
Author:   JensLehmann
Date:     2008-10-28 10:19:29 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
added web service method to query a predefined endpoint

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
    trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java	2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java	2008-10-28 10:19:29 UTC (rev 1472)
@@ -1,7 +1,6 @@
 package org.dllearner.kb.sparql;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.SortedSet;
 
 import org.apache.log4j.Logger;
 import org.dllearner.algorithms.gp.ADC;
@@ -134,7 +133,7 @@
 			System.out.println("Finished");*/
 			//String conj="EXISTS \"http://xmlns.com/foaf/0.1/page\".<= 0 \"http://www.w3.org/2004/02/skos/core#subject\".TOP";
 			//String conj="(\"Male\" AND (\"hasDog\" = 18))";
-			ObjectValueRestriction rest=new ObjectValueRestriction(new ObjectProperty("hasAge"),new Individual("18"));
+//			ObjectValueRestriction rest=new ObjectValueRestriction(new ObjectProperty("hasAge"),new Individual("18"));
 			//System.out.println(NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(rest));
 		} catch (/*Parse*/Exception e) {
 			// TODO Auto-generated catch block

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java	2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java	2008-10-28 10:19:29 UTC (rev 1472)
@@ -83,6 +83,8 @@
 			return getEndpointDBpedia();
 		} else if (name.equals("LOCALDBPEDIA")) {
 			return getEndpointLOCALDBpedia();
+		} else if (name.equals("LOCALGEONAMES")) {
+			return getEndpointLOCALGeonames();
 		} else if (name.equals("LOCALJOSECKI") || name.equals("LOCALJOSEKI") ) {
 			return getEndpointlocalJoseki();
 		} else if (name.equals("LOCALJOSEKIBIBLE")||name.equals("LOCALJOSECKIBIBLE")) {
@@ -157,6 +159,18 @@
 		return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
 	}
 
+	public static SparqlEndpoint getEndpointLOCALGeonames() {
+		URL u = null;
+		try { 
+			u = new URL("http://139.18.2.37:8890/sparql");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		LinkedList<String> defaultGraphURIs=new LinkedList<String>();
+		defaultGraphURIs.add("http://geonames.org");
+		return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
+	}	
+	
 	public static SparqlEndpoint getEndpointlocalJoseki() {
 		URL u = null;
 		try { 

Modified: trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java	2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java	2008-10-28 10:19:29 UTC (rev 1472)
@@ -44,6 +44,7 @@
  * @author Jens Lehmann
  *
  */
+@SuppressWarnings("unused")
 public class CalculatePageRank {
 	
 	private static String datasetDir;

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-10-28 10:19:29 UTC (rev 1472)
@@ -64,6 +64,7 @@
 import org.dllearner.kb.sparql.Cache;
 import org.dllearner.kb.sparql.NaturalLanguageDescriptionConvertVisitor;
 import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.kb.sparql.SparqlKnowledgeSource;
 import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
 import org.dllearner.kb.sparql.SparqlQueryException;
@@ -672,6 +673,19 @@
 		else return sparql.getJson();*/
 	}
 	
+	/**
+	 * Queries one of the standard endpoints defined in DL-Learner.
+	 * @param predefinedEndpoint A string describing the endpoint e.g. DBpedia.
+	 * @param query The SPARQL query.
+	 * @return The result of the SPARQL query in JSON format or null if the endpoint does not exist.
+	 * @see SPARQLEndpoint#getEndpointByName;
+	 */
+	public String sparqlQueryPredefinedEndpoint(String predefinedEndpoint, String query) {
+		SparqlEndpoint endpoint = SparqlEndpoint.getEndpointByName(predefinedEndpoint);
+		SPARQLTasks st = new SPARQLTasks(endpoint);
+		return st.query(query);
+	}
+	
 	@WebMethod
 	public boolean isSparqlQueryRunning(int sessionID, int queryID) throws ClientNotKnownException
 	{


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