From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 16 Nov 2011 18:08:18 +0000 (-0500)
Subject: fix get_nodes_with_slivers()
X-Git-Tag: sfa-1.1-3~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6a27a34ad0d8fd4efc381fa40bf35ac8e07d8a2d;p=sfa.git

fix get_nodes_with_slivers()
---

diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py
index e5ec58b4..4836cab6 100644
--- a/sfa/rspecs/elements/versions/pgv2Node.py
+++ b/sfa/rspecs/elements/versions/pgv2Node.py
@@ -60,7 +60,7 @@ class PGv2Node:
 
     @staticmethod
     def get_nodes_with_slivers(xml, filter={}):
-        xpath = '//node/sliver_type | //default:node/default:sliver_type' 
+        xpath = '//node[count(sliver_type)>0] | //default:node[count(default:sliver_type) > 0]' 
         node_elems = xml.xpath(xpath)        
         return PGv2Node.get_node_objs(node_elems)
 
diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py
index 91b27c70..9933eceb 100644
--- a/sfa/rspecs/elements/versions/sfav1Node.py
+++ b/sfa/rspecs/elements/versions/sfav1Node.py
@@ -112,7 +112,7 @@ class SFAv1Node:
 
     @staticmethod
     def get_nodes_with_slivers(xml):
-        xpath = '//node/sliver | //default:node/default:sliver' 
+        xpath = '//node[count(sliver)>0] | //default:node[count(default:sliver)>0]' 
         node_elems = xml.xpath(xpath)
         return SFAv1Node.get_node_objs(node_elems)