fixing precedence of mappers
authorEric Prud'hommeaux <bertails@w3.org>
Mon, 14 Dec 2009 03:11:18 -0500
changeset 30 724b4ff3e78c
parent 29 ba8ae716799e
child 31 10f3605b3b17
fixing precedence of mappers
src/main/scala/RDB2RDFMain.scala
--- a/src/main/scala/RDB2RDFMain.scala	Mon Dec 14 02:59:29 2009 -0500
+++ b/src/main/scala/RDB2RDFMain.scala	Mon Dec 14 03:11:18 2009 -0500
@@ -95,7 +95,7 @@
     val alias = AliasFromNode(u)
     val ObjUri(stem, rel, attr, value) = u
     val fqattr = FQAttribute(alias, pk.attr)
-    println("equiv|=" + fqattr + "=" + value)
+    println("equiv+= " + toString(fqattr) + "=" + value)
   }
 
   /** varConstraint
@@ -124,13 +124,14 @@
     **                                      Employee      _emp            manager       
     */
     val reldesc = db.relationdescs(rel)
-    val mapper:String = reldesc.attributes(attr) match {
-      case ForeignKey(fkrel, fkattr) =>
-	"RDFNode(" + rel.n.s + ", "
-      case Value(SQLDatatype(dt)) => {
-	reldesc.primarykey match {
-	  case Attribute(attr.n) => "RDFNode(" + rel.n.s + ", "
-	  case _ => dt + "Mapper("
+    val mapper:String = reldesc.primarykey match {
+      case Attribute(attr.n) => "RDFNoder(" + rel.n.s + ", "
+      case _ => {
+	reldesc.attributes(attr) match {
+	  case ForeignKey(fkrel, fkattr) =>
+	    "RDFNoder(" + rel.n.s + ", "
+	  case Value(SQLDatatype(dt)) =>
+	    dt + "Mapper("
 	}
       }
     }
@@ -139,7 +140,7 @@
   }
 
   def LiteralConstraint(lit:SparqlLiteral, attr:FQAttribute) = {
-    println("equiv|=" + attr + "=" + lit)
+    println("equiv+= " + toString(attr) + "=" + lit)
   }
 
   def toString(fqattr:FQAttribute) : String = {