X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=1a31711ea9f9e92309002a10aa33ca8f0f910152;hb=38e28ae142af328b236b4200da6b07ffc3f44887;hp=b700b60dc5c82e5f5fba4ed940cb0ac0199ae227;hpb=a26c2035f895f329fd7d2a8892b7606be0d46116;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index b700b60d..1a31711e 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -3,7 +3,6 @@ import libxslt
 from sfatables.globals import *
 
 class XMLRule:
-    
     def apply_processor(self, type, doc, output_xpath_filter=None):
         processor = self.processors[type]
 
@@ -11,6 +10,7 @@ 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)
@@ -35,20 +35,16 @@ class XMLRule:
         filepath = os.path.join(sfatables_config, 'processors', self.final_processor)
 
         if not os.path.exists(filepath):
-            # TODO: final_processor is not there yet
-            return doc#rspec
+            raise Exception('Could not find final rule filter')
 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
-        #doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
-        stylesheet_result = style.saveResultToString(result)
+        stylesheet_result = result#style.saveResultToString(result)
         style.freeStylesheet()
-        doc.freeDoc()
-        result.freeDoc()
+        #doc.freeDoc()
+        #result.freeDoc()
 
-        import pdb
-        pdb.set_trace()
         return stylesheet_result
 
     def match(self, rspec):
@@ -59,18 +55,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):
@@ -93,27 +111,17 @@ 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
         self.xmldoc = None
         self.terminal = 0
-        self.final_processor = '__sfatables_wrap_up__.xsl'
+        self.final_processor = '__sfatables_rule_wrap_up__.xsl'
 
         self.arguments = {'match':None,'target':None}
         self.processors = {'match':None,'target':None}