[DL-Learner SVN] SF.net SVN: dl-learner:[3900] trunk/components-ext/src/main/java/org/ dllearner/common/index

[<lor...@us...>]

Revision: 3900
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3900&view=rev
Author:   lorenz_b
Date:     2013-02-18 14:14:10 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
Updated index queries.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLClassesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLDatatypePropertiesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLObjectPropertiesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoClassesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoDatatypePropertiesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoObjectPropertiesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoPropertiesIndex.java
    trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoResourcesIndex.java

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLClassesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLClassesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLClassesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -29,7 +29,7 @@
 				"FILTER(REGEX(STR(?label), '%s'))}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "SELECT DISTINCT * WHERE {\n" +
+		super.queryWithLabelTemplate = "SELECT DISTINCT ?uri ?label WHERE {\n" +
 				"?s a ?uri.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label\n" +
 				"FILTER(REGEX(STR(?label), '%s'))}\n" +

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLDatatypePropertiesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLDatatypePropertiesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLDatatypePropertiesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -23,14 +23,14 @@
 	
 	private void init(){
 		super.queryTemplate = "SELECT ?uri WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:DatatypeProperty." + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label\n" +
 				"FILTER(REGEX(STR(?label), '%s', 'i'))}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT * WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT ?uri ?label WHERE {\n" +
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:DatatypeProperty." + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label\n" +
 				"FILTER(REGEX(STR(?label), '%s', 'i'))}\n" +

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -32,7 +32,7 @@
 			"FILTER(REGEX(STR(?label), '%s'))}\n" +
 			"LIMIT %d OFFSET %d";
 	
-	protected String queryWithLabelTemplate = "SELECT DISTINCT * WHERE {\n" +
+	protected String queryWithLabelTemplate = "SELECT DISTINCT ?uri ?label WHERE {\n" +
 			"?uri a ?type.\n" + 
 			"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label\n" +
 			"FILTER(REGEX(STR(?label), '%s'))}\n" +
@@ -139,7 +139,7 @@
 			}
 		} else {
 			rs = QueryExecutionFactory.create(QueryFactory.create(query, Syntax.syntaxARQ), model).execSelect();
-		}
+		}System.out.println("Done");
 		return rs;
 	}
 	

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLObjectPropertiesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLObjectPropertiesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLObjectPropertiesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -23,14 +23,14 @@
 	
 	private void init(){
 		super.queryTemplate = "SELECT ?uri WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:ObjectProperty." + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label\n" +
 				"FILTER(REGEX(STR(?label), '%s', 'i'))}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT * WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT ?uri ?label WHERE {\n" +
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:ObjectProperty." + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label\n" +
 				"FILTER(REGEX(STR(?label), '%s', 'i'))}\n" +

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoClassesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoClassesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoClassesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -24,13 +24,15 @@
 	
 	private void init(){
 		super.queryTemplate = "SELECT DISTINCT ?uri WHERE {\n" +
-				"?s a ?uri.\n" + 
+				"{?s a ?uri} UNION {?uri a owl:Class}.\n" + 
+//				"?s a ?uri.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "SELECT DISTINCT * WHERE {\n" +
-				"?s a ?uri.\n" + 
+		super.queryWithLabelTemplate = "SELECT DISTINCT ?uri ?label WHERE {\n" +
+				"{?s a ?uri} UNION {?uri a owl:Class}.\n" + 
+//				"?s a ?uri.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +
 				"LIMIT %d OFFSET %d";

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoDatatypePropertiesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoDatatypePropertiesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoDatatypePropertiesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -23,14 +23,14 @@
 	
 	private void init(){
 		super.queryTemplate = "SELECT ?uri WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:DatatypeProperty.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT * WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT ?uri ?label WHERE {\n" +
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:DatatypeProperty.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoObjectPropertiesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoObjectPropertiesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoObjectPropertiesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -23,14 +23,14 @@
 	
 	private void init(){
 		super.queryTemplate = "SELECT ?uri WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:ObjectProperty.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label." +
 				"?label bif:contains '\"%s\"'}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT * WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT ?uri ?label WHERE {\n" +
+//				"?s ?uri ?o.\n" + 
 				"?uri a owl:ObjectProperty.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoPropertiesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoPropertiesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoPropertiesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -29,13 +29,15 @@
 	
 	private void init(){
 		super.queryTemplate = "SELECT DISTINCT ?uri WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+//				"?s ?uri ?o.\n" + 
+				"{SELECT DISTINCT ?uri WHERE {?s ?uri ?o.}}\n" +
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +
 				"LIMIT %d OFFSET %d";
 		
 		super.queryWithLabelTemplate = "PREFIX owl:<http://www.w3.org/2002/07/owl#>  SELECT DISTINCT ?uri ?label WHERE {\n" +
-				"?s ?uri ?o.\n" + 
+//				"?s ?uri ?o.\n" + 
+				"{SELECT DISTINCT ?uri WHERE {?s ?uri ?o.}}\n" +
 //				"{?uri a owl:DatatypeProperty.} UNION {?uri a owl:ObjectProperty.} " + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoResourcesIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoResourcesIndex.java	2013-02-16 13:03:00 UTC (rev 3899)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/VirtuosoResourcesIndex.java	2013-02-18 14:14:10 UTC (rev 3900)
@@ -32,7 +32,7 @@
 				"?label bif:contains '\"%s\"'}\n" +
 				"LIMIT %d OFFSET %d";
 		
-		super.queryWithLabelTemplate = "SELECT DISTINCT * WHERE {\n" +
+		super.queryWithLabelTemplate = "SELECT DISTINCT ?uri ?label WHERE {\n" +
 				"?uri a ?type.\n" + 
 				"?uri <http://www.w3.org/2000/01/rdf-schema#label> ?label.\n" +
 				"?label bif:contains '\"%s\"'}\n" +

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