From 6a27a34ad0d8fd4efc381fa40bf35ac8e07d8a2d Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 16 Nov 2011 13:08:18 -0500 Subject: [PATCH] fix get_nodes_with_slivers() --- sfa/rspecs/elements/versions/pgv2Node.py | 2 +- sfa/rspecs/elements/versions/sfav1Node.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) -- 2.43.0