From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 29 Oct 2009 15:29:17 +0000 (+0000)
Subject: Attempted fixes
X-Git-Tag: sfa-0.9-6~90
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=c2e9dd3d42acb5869ea1635f7a5f6c7b600f211a

Attempted fixes
---

diff --git a/sfatables/matches/slice-whitelist.xml b/sfatables/matches/slice-whitelist.xml
index 2489c1c8..ad3c8401 100644
--- a/sfatables/matches/slice-whitelist.xml
+++ b/sfatables/matches/slice-whitelist.xml
@@ -1,4 +1,7 @@
 <match name="slice-whitelist">
-    <context select="//request-context/slice@hrn"/>
-    <processor filename="slice-whitelist.xsl"/>
+    <!-- Empty context. We _always_ get the hrn of the current user -->
+    <rule element='*'>
+      <context select="//sfa/current/slice@hrn"/>
+      <processor filename="slice-whitelist.xsl"/>
+    </rule>
 </match>
diff --git a/sfatables/processors/slice-whitelist.xsl b/sfatables/processors/slice-whitelist.xsl
index afe77f2e..8ca8deb2 100644
--- a/sfatables/processors/slice-whitelist.xsl
+++ b/sfatables/processors/slice-whitelist.xsl
@@ -20,7 +20,7 @@
     <xsl:variable name="whitelist" select="exsl:node-set($whitelist_data)/hrn"/>
 
     <!-- Read the value of the current slice's hrn -->
-    <xsl:variable name="current_slice_hrn" select="//request-context/slice/hrn"/>
+    <xsl:variable name="current_slice_hrn" select="//request-context/sfa/slice/hrn"/>
 
     <!-- Define a function that checks if one of a list of prefixes (lst) matches $current_slice_hrn". It's a stupid idea to call a function a 'template' but whatever...  -->
     <xsl:template name="recurse_list">