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

[<ku...@us...>]

Revision: 2002
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2002&view=rev
Author:   kurzum
Date:     2010-02-10 10:48:19 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
added retrieval of labels to SPARQLDescriptionConverter

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java

Modified: trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java	2010-02-10 10:36:24 UTC (rev 2001)
+++ trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java	2010-02-10 10:48:19 UTC (rev 2002)
@@ -111,7 +111,7 @@
 	 * @return A SPARQL query of the underlying description.
 	 */
 	public String getSparqlQuery(int limit) {
-		return SparqlQueryDescriptionConvertVisitor.getSparqlQuery(description, limit);
+		return SparqlQueryDescriptionConvertVisitor.getSparqlQuery(description, limit, false);
 	}	
 	
 	/**

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java	2010-02-10 10:36:24 UTC (rev 2001)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java	2010-02-10 10:48:19 UTC (rev 2002)
@@ -83,15 +83,8 @@
 	 * = RDFSReasoning; }
 	 */
 
-	private String getSparqlQuery(int resultLimit) { // for old function see
-														// below
-		// it was using the object attribute in a strange way
-		// QUALITY: what if this function is called several times?? should be
-		// private maybe?
-		String tmpQuery = "SELECT ?subject \nWHERE {" + query + " }\n " + limit(resultLimit);
-
-		query = tmpQuery;
-		return query;
+	private String getSparqlQuery(int resultLimit, boolean labels) { 
+		return "SELECT ?subject \nWHERE { "+((labels)?" ?subject rdfs:label ?label .":"")+" " + query + " }\n " + limit(resultLimit);
 	}
 
 	public static String getSparqlQuery(String descriptionKBSyntax) throws ParseException {
@@ -100,18 +93,17 @@
 
 	public static String getSparqlQuery(String descriptionKBSyntax, int limit) throws ParseException {
 		Description d = KBParser.parseConcept(descriptionKBSyntax);
-		return getSparqlQuery(d, limit);
+		return getSparqlQuery(d, limit, false);
 	}
 
 	public static String getSparqlQuery(Description description) {
-		return getSparqlQuery(description, defaultLimit);
+		return getSparqlQuery(description, defaultLimit, false);
 	}
 
-	public static String getSparqlQuery(Description description, int resultLimit) {
+	public static String getSparqlQuery(Description description, int resultLimit, boolean labels) {
 		SparqlQueryDescriptionConvertVisitor visitor = new SparqlQueryDescriptionConvertVisitor();
 		description.accept(visitor);
-		String ret = visitor.getSparqlQuery(resultLimit);
-		return ret;
+		return visitor.getSparqlQuery(resultLimit, labels);
 	}
 
 	/**
@@ -244,7 +236,6 @@
 	 * .Intersection)
 	 */
 	public void visit(Intersection description) {
-		// HACK see replace hacks in other functions
 		logger.trace("Intersection");
 		description.getChild(0).accept(this);
 		query += ".";


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