X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=d8b30dcf869612377cd76147fd1be53d8dc283ab;hb=56c83fbbe57587bc321f73b1ca31cc3d592a707e;hp=310c84392132150ad67ed2faeec2a09a330392c9;hpb=805a8364a6ce7295edb2bad37bd26e12e3dbecac;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 310c8439..d8b30dcf 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -10,7 +10,6 @@ class XMLRule:
         filepath = os.path.join(sfatables_config, 'processors', processor)
         # XXX
 
-        print filepath
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
         result = style.applyStylesheet(doc, None)
@@ -55,18 +54,40 @@ class XMLRule:
         target_result = self.apply_processor('target',rspec,None)
         return target_result
 
+    def add_rule_context_to_rspec(self, doc):
+        p = doc.xpathNewContext()
+        context = p.xpathEval("//RSpec")
+        if (not context):
+            raise Exception('Request is not an rspec')
+        else:
+            # Add the request context
+            matchNode = libxml2.newNode('match-context')
+            for match_argument in self.arguments['match']:
+                matchNode.addChild(match_argument)
+
+            targetNode = libxml2.newNode('target-context')
+            for target_argument in self.arguments['target']:
+                targetNode.addChild(target_argument)
+
+            context[0].addChild(matchNode)
+            context[0].addChild(targetNode)
+        p.xpathFreeContext()
+
+        return doc
+
     def apply_interpreted(self, rspec):
+        rspec = self.add_rule_context_to_rspec(rspec)
         # Interpreted
         #
         # output =
         #    if (match(match_args, rspec)
         #       then target(target_args, rspec)
         #       else rspec
-
+        
         if (self.match(rspec)):
-            return self.target(rspec)
+            return self.wrap_up(self.target(rspec))
         else:
-            return rspec
+            return self.wrap_up(rspec)
 
 
     def apply_compiled(rspec):
@@ -89,21 +110,11 @@ class XMLRule:
             self.terminal = 1
         
         self.processors[type] = processor[0].content
-        self.arguments[type] = p.xpathEval('//rule')
+        self.arguments[type] = p.xpathEval('//rule//argument[value!=""]')
 
         p.xpathFreeContext()
 
 
-    def wrap_rspec (self, type, rspec):
-        argument = self.arguments[type]
-        p = rspec.xmldoc.xpathNewContext()
-        root_node = p.xpathEval('/RSpec')
-        if (not root_node or not root_node):
-            raise Exception('An evil aggregate manager sent me a malformed RSpec. Please see the stack trace to identify it.')
-
-        root_node.addChild(arguments[type])
-        return rspec
-
     def __init__(self, chain=None, rule_number=None):
         self.rule_number = None
         self.chain = None