svn commit: r1207118 - in /incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms: ClassAtom.java DatavaluedPropertyAtom.java IndividualPropertyAtom.java

[anuzzolese]

Author: anuzzolese
Date: Mon Nov 28 12:55:13 2011
New Revision: 1207118

URL: http://svn.apache.org/viewvc?rev=1207118&view=rev
Log:
[STANBOL-186] Fixed a bug related to the conversion of rules to Jena.

Modified:
    
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java
    
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java
    
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java

Modified: 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java?rev=1207118&r1=1207117&r2=1207118&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java
 (original)
+++ 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/ClassAtom.java
 Mon Nov 28 12:55:13 2011
@@ -194,12 +194,12 @@ public class ClassAtom extends CoreAtom 
        public ClauseEntry toJenaClauseEntry() {
                String subject = argument1.toString();
                
if(subject.startsWith("http://kres.iks-project.eu/ontology/meta/variables#";)){
-                       subject = "?" + 
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
+                       subject = 
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
                }
                
                String object = classResource.toString();
                
if(object.startsWith("http://kres.iks-project.eu/ontology/meta/variables#";)){
-                       object ="?" +  
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
+                       object = 
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
                }
                ClauseEntry clauseEntry = new 
TriplePattern(Node.createVariable(subject), RDF.type.asNode(), 
Node.createURI(object));
                return clauseEntry;

Modified: 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java?rev=1207118&r1=1207117&r2=1207118&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java
 (original)
+++ 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/DatavaluedPropertyAtom.java
 Mon Nov 28 12:55:13 2011
@@ -314,9 +314,16 @@ public class DatavaluedPropertyAtom exte
                        subject = "?" + 
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
                }
                
+               
+               Node objectNode = null;
                String object = argument2.toString();
                
if(object.startsWith("http://kres.iks-project.eu/ontology/meta/variables#";)){
-                       object = "?" + 
object.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
+                       object = 
object.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
+                       
+                       objectNode = Node.createVariable(object);
+               }
+               else{
+                       objectNode = Node.createLiteral(object);
                }
                
                String predicate = datatypeProperty.toString();
@@ -324,7 +331,7 @@ public class DatavaluedPropertyAtom exte
                        predicate = "?" + 
predicate.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
                }
                
-               ClauseEntry clauseEntry = new 
TriplePattern(Node.createURI(subject), Node.createURI(predicate), 
Node.createLiteral(object));
+               ClauseEntry clauseEntry = new 
TriplePattern(Node.createURI(subject), Node.createURI(predicate), objectNode);
                return clauseEntry;
        }
        

Modified: 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java?rev=1207118&r1=1207117&r2=1207118&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java
 (original)
+++ 
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/IndividualPropertyAtom.java
 Mon Nov 28 12:55:13 2011
@@ -238,7 +238,7 @@ public class IndividualPropertyAtom exte
                
                String object = argument2.toString();
                
if(object.startsWith("http://kres.iks-project.eu/ontology/meta/variables#";)){
-                       object = "?" + 
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
+                       object = 
subject.replace("http://kres.iks-project.eu/ontology/meta/variables#";, "");
                }
                
                String predicate = objectProperty.toString();