From 70462d7a62484c415bd11fb331aaa84c6e7fa070 Mon Sep 17 00:00:00 2001
From: Gerolf Seitz <gerolf.seitz@gmail.com>
Date: Thu, 1 Dec 2011 23:57:05 +0100
Subject: [PATCH] Add version to nodes.

---
 .../sbt/graph/IvyGraphMLDependencies.scala    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/net/virtualvoid/sbt/graph/IvyGraphMLDependencies.scala b/src/main/scala/net/virtualvoid/sbt/graph/IvyGraphMLDependencies.scala
index def166018..b2f07bdea 100644
--- a/src/main/scala/net/virtualvoid/sbt/graph/IvyGraphMLDependencies.scala
+++ b/src/main/scala/net/virtualvoid/sbt/graph/IvyGraphMLDependencies.scala
@@ -21,18 +21,18 @@ import java.io.File
 import xml.{XML, Node}
 
 object IvyGraphMLDependencies extends App {
-  case class Module(organisation: String, name: String) {
-    def id: String = organisation+"."+name
+  case class Module(organisation: String, name: String, version: String) {
+    def id: String = organisation+"."+name+"-"+version
   }
   def transform(ivyReportFile: String, outputFile: String) {
     val doc = ConstructingParser.fromSource(io.Source.fromFile(ivyReportFile), false).document
 
-    val edges =
-      for (mod <- doc \ "dependencies" \ "module";
-           depModule = nodeFromElement(mod);
-           caller <- mod \ "revision" \ "caller";
-           callerModule = nodeFromElement(caller))
-        yield (callerModule, depModule)
+    val edges = for {
+        mod <- doc \ "dependencies" \ "module"
+        caller <- mod \ "revision" \ "caller"
+        callerModule = nodeFromElement(caller, caller.attribute("callerrev").get.text)
+        depModule = nodeFromElement(mod, caller.attribute("rev").get.text)
+      } yield (callerModule, depModule)
 
     val nodes = edges.flatMap(e => Seq(e._1, e._2)).distinct
 
@@ -63,8 +63,8 @@ object IvyGraphMLDependencies extends App {
 
     XML.save(outputFile, xml)
   }
-  def nodeFromElement(element: Node): Module =
-    Module(element.attribute("organisation").get.text, element.attribute("name").get.text)
+  def nodeFromElement(element: Node, version: String): Module =
+    Module(element.attribute("organisation").get.text, element.attribute("name").get.text, version)
 
   def die(msg: String): Nothing = {
     println(msg)
@@ -76,4 +76,4 @@ object IvyGraphMLDependencies extends App {
   val file = args.lift(0).filter(f => new File(f).exists).getOrElse(die(usage))
   val inputFile = args.lift(1).getOrElse(die(usage))
   transform(file, inputFile)
-}
\ No newline at end of file
+}