From 8329de0b73255bb914d27f30512b3d39b77ebf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Thu, 17 Jan 2008 22:55:15 +0000
Subject: [PATCH] - updated with new RdfExporter of mappingapi

---
 .../impl/renderer/RDFRendererVisitor.java     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
index 5335aac5..f2eb264a 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
@@ -33,11 +33,15 @@ import org.semanticweb.owl.align.Relation;
 // using the namespace facility of BasicAlignment
 import fr.inrialpes.exmo.align.impl.BasicAlignment;
 
-import org.omwg.mediation.language.export.omwg.OmwgSyntaxFormat;
-//import org.omwg.mediation.language.export.rdf.RdfSyntaxFormat;
+//import org.omwg.mediation.language.export.omwg.OmwgSyntaxFormat;
+import org.omwg.mediation.language.export.rdf.RdfSyntaxFormat;
 import org.omwg.mediation.parser.alignment.NamespaceDefs;
 import org.omwg.mediation.language.objectmodel.api.Expression;
 
+// JE: we need jena... only for this renderer!
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
 /**
  * Renders an alignment in its RDF format
  *
@@ -51,11 +55,13 @@ public class RDFRendererVisitor implements AlignmentVisitor
     PrintWriter writer = null;
     Alignment alignment = null;
     Cell cell = null;
-    OmwgSyntaxFormat oMWGformatter = null;
-    //RdfSyntaxFormat oMWGformatter = null;
+    //OmwgSyntaxFormat oMWGformatter = null;
+    RdfSyntaxFormat oMWGformatter = null;
+    Model model = null;
 
     public RDFRendererVisitor( PrintWriter writer ){
 	this.writer = writer;
+	Model model = ModelFactory.createDefaultModel();
     }
 
     public void visit( Alignment align ) throws AlignmentException {
@@ -80,10 +86,10 @@ public class RDFRendererVisitor implements AlignmentVisitor
 	writer.print("  <level>");
 	writer.print( align.getLevel() );
 	if ( align.getLevel().equals("2OMWG") ) {
-	    oMWGformatter = new OmwgSyntaxFormat();
-	    //oMWGformatter = new RdfSyntaxFormat();
+	    //oMWGformatter = new OmwgSyntaxFormat();
+	    oMWGformatter = new RdfSyntaxFormat();
 	    // This is a trick for having namespaces output
-	    oMWGformatter.setDefaultNamespace( NamespaceDefs.ALIGNMENT );
+	    //oMWGformatter.setDefaultNamespace( NamespaceDefs.ALIGNMENT );
 	}
 	writer.print("</level>\n  <type>");
 	writer.print( align.getType() );
@@ -149,9 +155,11 @@ public class RDFRendererVisitor implements AlignmentVisitor
 	    // But this should be it! (at least for this one)
 	    if ( alignment.getLevel().equals("2OMWG") ) {
 		writer.print("      <entity1>");
-		writer.print( oMWGformatter.export( (Expression)cell.getObject1() ) );
+		//writer.print( oMWGformatter.export( (Expression)cell.getObject1() ) );
+		writer.print( oMWGformatter.getExprNode( (Expression)cell.getObject1(), model ) );
 		writer.print("</entity1>\n      <entity2>");
-		writer.print( oMWGformatter.export( (Expression)cell.getObject2() ) );
+		//writer.print( oMWGformatter.export( (Expression)cell.getObject2() ) );
+		writer.print( oMWGformatter.getExprNode( (Expression)cell.getObject2(), model ) );
 		writer.print("</entity2>\n      <relation>");
 		//writer.print(cell.getRelation().getRelation());
 		cell.getRelation().accept( this );
-- 
GitLab