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

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

Revision: 1760
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1760&view=rev
Author:   kurzum
Date:     2009-05-19 17:51:46 +0000 (Tue, 19 May 2009)

Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java
    trunk/src/dl-learner/org/dllearner/kb/manipulator/StringToResource.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java

Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java	2009-05-19 17:23:45 UTC (rev 1759)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/Manipulator.java	2009-05-19 17:51:46 UTC (rev 1760)
@@ -80,7 +80,7 @@
 		} else if(predefinedManipulator.equalsIgnoreCase("DEFAULT")
 				||predefinedManipulator.equalsIgnoreCase("STANDARD")){
 			return getDefaultManipulator();
-		}
+		} 
 		else {
 			//QUALITY maybe not the best, 
 			return getDefaultManipulator();

Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/StringToResource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/StringToResource.java	2009-05-19 17:23:45 UTC (rev 1759)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/StringToResource.java	2009-05-19 17:51:46 UTC (rev 1760)
@@ -48,7 +48,7 @@
 			slash="/";
 		}
 		
-		this.namespace = slash+resourceNamespace;
+		this.namespace = resourceNamespace+slash;
 		this.limit = limit;
 	}
 	
@@ -57,20 +57,26 @@
 	public  SortedSet<RDFNodeTuple> applyRule(Node subject, SortedSet<RDFNodeTuple> tuples){
 		SortedSet<RDFNodeTuple> keep = new TreeSet<RDFNodeTuple>();
 		for (RDFNodeTuple tuple : tuples) {
+			
 			// do nothing if the object contains http://
-			if(!tuple.b.isResource()){
+			if(!tuple.b.isURIResource()){
 				boolean replace = true;
+				
 				//check for numbers 
-				if(((Literal) tuple.b).getDatatypeURI().contains("decimal")){
+				if(((Literal) tuple.b).getDatatypeURI()!= null){
 						replace = false; 
 							
 				}
-				
 				// do nothing if limit is exceeded
 				if(limit != 0 && tuple.b.toString().length()>limit){
 					replace = false;
 				}
 				
+				if(tuple.b.toString().startsWith("http://")){
+					replace= false;
+				}
+				
+				
 				if (replace){
 				
 					String tmp = tuple.b.toString();
@@ -78,7 +84,8 @@
 						//encode
 					tmp = URLEncoder.encode(tmp, "UTF-8");
 					}catch (Exception e) {
-						// TODO: handle exception
+						e.printStackTrace();
+						System.exit(0);
 					}
 					
 					tuple.b = new ResourceImpl(namespace+tmp);

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2009-05-19 17:23:45 UTC (rev 1759)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2009-05-19 17:51:46 UTC (rev 1760)
@@ -111,7 +111,9 @@
 	
 	private OWLOntology fragment;
 	
+	private Manipulator manipulator = null;
 	
+	
 
 	// received ontology as array, used if format=Array(an element of the
 	// array consists of the subject, predicate and object separated by '<'
@@ -435,6 +437,11 @@
 	}
 
 	public Manipulator getManipulator() {
+		
+		if(this.manipulator!=null){
+			return this.manipulator;
+		}
+		
 		// get Options for Filters
 		if (configurator.getPredefinedManipulator() != null) {
 			return Manipulator.getManipulatorByName(configurator
@@ -452,6 +459,11 @@
 		}
 
 	}
+	
+	public void setManipulator(Manipulator m ){
+		this.manipulator = m;
+		
+	}
 
 	public TupleAquisitor getTupleAquisitor() {
 		TupleAquisitor ret = null;


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