diff --git a/src/main/scala/org/rosi_project/example/ExampleAml.scala b/src/main/scala/org/rosi_project/example/ExampleAml.scala index a2abfc6e086496ada990ac53d7cd9fc72b813c02..efe4189d3dadce0dda83c49cb574983a6d5314eb 100644 --- a/src/main/scala/org/rosi_project/example/ExampleAml.scala +++ b/src/main/scala/org/rosi_project/example/ExampleAml.scala @@ -396,7 +396,7 @@ object ExampleAml extends App { println(q.getQuery()) println(q.getQuery().runQuery()) - println("+++++++++++ MJ + ++++++++++++++++++++++") + println("+++++++++++ MJ 6 ++++++++++++++++++++++") q.getQuery().generateModelJoinFromQuery("Query6") } diff --git a/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala b/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala index e83687803d4bdc05888600479c07e81d37736b8f..4202ef8df67789c40e0682aad141e8bb43b9ce82 100644 --- a/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala +++ b/src/main/scala/org/rosi_project/model_management/sum/query/RsumQuery.scala @@ -60,7 +60,7 @@ class RsumQuery(_name: String) extends Query(_name) { val playerStart: Object = q.player.right.get val playerSource: Object = q.source.player.right.get val playerTarget: Object = q.target.player.right.get - println("+" + playerStart.getClass.getName + " " + playerSource.getClass.getName + " " + playerTarget.getClass.getName) + //println("+" + playerStart.getClass.getName + " " + playerSource.getClass.getName + " " + playerTarget.getClass.getName) if (!relNames.contains(playerStart.getClass.getName)) { var nameChange = playerStart.getClass.getSimpleName if (nameChange.startsWith(playerSource.getClass.getSimpleName)) { @@ -137,11 +137,11 @@ class RsumQuery(_name: String) extends Query(_name) { if (playerStart.isInstanceOf[QueryHelper]) { clsName = playerStart.getClass.getSuperclass.getName } - println("-" + clsName) + //println("-" + clsName) val nj = creator.createNaturalJoin(clsName) playerStart.getClass.getMethods.filter(m => m.getParameterCount == 0 && m.getDeclaringClass.getName != "java.lang.Object" && m.getName != "toString" && !m.getName.startsWith("get")).foreach(m => { - println(nj + " " + clsName + " " + m.getName) + //println(nj + " " + clsName + " " + m.getName) creator.createAttribute(nj, clsName, m.getName) }) creator.createFile(creator.done(nj), fileName + ".modeljoin")