From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Wed, 9 Sep 2009 20:34:41 +0000 (+0000)
Subject: Fixed the 'restrict to nodes' target.
X-Git-Tag: sfa-0.9-1~8
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1e0af3848c4a274cdb09d2c8f22b89b412031954

Fixed the 'restrict to nodes' target.
---

diff --git a/sfatables/commands/Add.py b/sfatables/commands/Add.py
index 26ba543b..5064ee69 100644
--- a/sfatables/commands/Add.py
+++ b/sfatables/commands/Add.py
@@ -39,8 +39,6 @@ class Add(Command):
 
             if (hasattr(match_options,option_name)):
                 context = p.xpathEval("//rule/argument[name='%s']"%option_name)
-                import pdb
-                pdb.set_trace()
                 if (not context):
                     raise Exception('Unknown option %s for match %s'%(option,option['name']))
                 else:
diff --git a/sfatables/targets/restrict_to_nodes.xsl b/sfatables/targets/restrict_to_nodes.xsl
index bf63cbc8..2ecba229 100644
--- a/sfatables/targets/restrict_to_nodes.xsl
+++ b/sfatables/targets/restrict_to_nodes.xsl
@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:template match="/">
-        <xsl:variable name="whitelist_prefix" select="//rule/argument[name='whitelist']/value"/>
-        <xsl:variable name="nodes_minus_whitelist" select="//request/nodespec/node"/>
-        <xsl:value-of select="$nodes_minus_whitelist"/>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <!-- Magic sauce copied from a manual. This fragment basically copies everything except for
+    stuff that explicitly matches with the templates defined below. In the case of such a match,
+    the matched node is treated differently.-->
+    <xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
     </xsl:template>
+
+    <xsl:variable name="whitelist_prefix" select="//rspec//rule/argument[name='whitelist']/value"/>
+    <xsl:variable name="blacklist_prefix" select="//rspec//rule/argument[name='blacklist']/value"/>
+
+    <!-- Drop nodes that are not in the whitelist -->
+    <xsl:template match="node">
+            <xsl:choose>
+                <xsl:when test="starts-with(@name,$whitelist_prefix) and not($blacklist_prefix and starts-with(@name,$blacklist_prefix))">
+                    <xsl:copy-of select="."/>
+                </xsl:when>
+                <xsl:otherwise/>
+            </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="sfatables-input"/>
 </xsl:stylesheet>