fix get_nodes_with_slivers()
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 16 Nov 2011 18:08:18 +0000 (13:08 -0500)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 16 Nov 2011 18:08:18 +0000 (13:08 -0500)
sfa/rspecs/elements/versions/pgv2Node.py
sfa/rspecs/elements/versions/sfav1Node.py

index e5ec58b..4836cab 100644 (file)
@@ -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)
 
index 91b27c7..9933ece 100644 (file)
@@ -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)