From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Mon, 26 Oct 2009 14:52:06 +0000 (+0000)
Subject: Added separate contexts for matches and targets, instead of having combined contexts... 
X-Git-Tag: sfa-0.9-6~123
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=48419f9fd595bda0eee33f2c92fff39891c4d921

Added separate contexts for matches and targets, instead of having combined contexts for rules.
---

diff --git a/sfatables/processors/hrn.xsl b/sfatables/processors/hrn.xsl
index 318739af..a0adff23 100644
--- a/sfatables/processors/hrn.xsl
+++ b/sfatables/processors/hrn.xsl
@@ -9,7 +9,7 @@
             <xsl:apply-templates select="@* | node()"/>
     </xsl:template>
 
-    <xsl:template match="user">
+    <xsl:template match="//match-context//user">
                     <xsl:choose>
                     <xsl:when test="starts-with($context-hrn, hrn)">
                         <result verdict="True"/> <!--Match -->
diff --git a/sfatables/processors/link/restrict_slice.xml b/sfatables/processors/link/restrict_slice.xml
index ee641cca..b3271a65 100644
--- a/sfatables/processors/link/restrict_slice.xml
+++ b/sfatables/processors/link/restrict_slice.xml
@@ -11,7 +11,7 @@
     <!-- End of magic sauce -->
 
     <!-- Read in the value of the argument. See 'example_vini_rspec.xml' for an example of such an argument -->
-    <xsl:variable name="max-link-bandwidth" select="//RSpec//rule-context/argument[name='max-link-bandwidth']/value"/>
+    <xsl:variable name="max-link-bandwidth" select="//rspec//rule-context/argument[name='max-link-bandwidth']/value"/>
 
     <!-- Drop Linkspecs for which bw > max-link-bandwidth -->
     <xsl:template match="LinkSpec">
diff --git a/sfatables/processors/max_link_bandwidth.xsl b/sfatables/processors/max_link_bandwidth.xsl
index ee641cca..42b57113 100644
--- a/sfatables/processors/max_link_bandwidth.xsl
+++ b/sfatables/processors/max_link_bandwidth.xsl
@@ -11,7 +11,7 @@
     <!-- End of magic sauce -->
 
     <!-- Read in the value of the argument. See 'example_vini_rspec.xml' for an example of such an argument -->
-    <xsl:variable name="max-link-bandwidth" select="//RSpec//rule-context/argument[name='max-link-bandwidth']/value"/>
+    <xsl:variable name="max-link-bandwidth" select="//rspec//target-context/argument[name='max-link-bandwidth']/value"/>
 
     <!-- Drop Linkspecs for which bw > max-link-bandwidth -->
     <xsl:template match="LinkSpec">
diff --git a/sfatables/processors/restrict_to_nodes.xsl b/sfatables/processors/restrict_to_nodes.xsl
index e9b821fe..b6a3eba7 100644
--- a/sfatables/processors/restrict_to_nodes.xsl
+++ b/sfatables/processors/restrict_to_nodes.xsl
@@ -9,8 +9,8 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:variable name="whitelist_prefix" select="//rspec//rule-context/argument[name='whitelist']/value"/>
-    <xsl:variable name="blacklist_prefix" select="//rspec//rule-context/argument[name='blacklist']/value"/>
+    <xsl:variable name="whitelist_prefix" select="//rspec//target-context/argument[name='whitelist']/value"/>
+    <xsl:variable name="blacklist_prefix" select="//rspec//target-context/argument[name='blacklist']/value"/>
 
     <!-- Drop nodes that are not in the whitelist -->
     <xsl:template match="node">