Merge remote-tracking branch 'origin/pr/85'

jacomyal · jacomyal · commit e8b5118222bd · 2013-04-03T09:11:42.000+02:00
* origin/pr/85:
  Use required ID attribute when parsing GEXF
diff --git a/plugins/sigma.parseGexf.js b/plugins/sigma.parseGexf.js
@@ -121,18 +121,18 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {
   }
 
   var edges = [];
-  var edgeId = 0;
   var edgesNodes = gexf.getElementsByTagName('edges');
   for(i=0; i<edgesNodes.length; i++){
     var edgesNode = edgesNodes[i];
     var edgeNodes = edgesNode.getElementsByTagName('edge');
     for(j=0; j<edgeNodes.length; j++){
       var edgeNode = edgeNodes[j];
+      var id = edgeNode.getAttribute('id');
       var source = edgeNode.getAttribute('source');
       var target = edgeNode.getAttribute('target');
       var label = edgeNode.getAttribute('label');
       var edge = {
-        id:         j,
+        id:         id,
         sourceID:   source,
         targetID:   target,
         label:      label,
@@ -152,7 +152,7 @@ sigma.publicPrototype.parseGexf = function(gexfPath) {
         edge.attributes.push({attr:attr, val:val});
       }
 
-      sigmaInstance.addEdge(edgeId++,source,target,edge);
+      sigmaInstance.addEdge(id,source,target,edge);
     }
   }
 };
