X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=d137e4e6d3b28f9363c3dc7457f3f69280ed3629;hb=36e0c5270b13974b487d2a7a44e1a0677dac0283;hp=c363ab925a42775b45dea4882903e7dcd0bba66b;hpb=9fcd24492ce3094030aa0f2fc73c86b2259cce4e;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index c363ab92..d137e4e6 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -3,26 +3,16 @@ import libxslt
 from sfatables.globals import *
 
 class XMLRule:
-    rule_number = None
-    chain = None
-    xmldoc = None
-    terminal = 0
-    final_processor = '__sfatables_wrap_up__.xsl'
-
-    arguments = {'match':None,'target':None}
-    processors = {'match':None,'target':None}
-    context = {'match':None,'target':None}
-
-    def apply_processor(self, type, rspec, output_xpath_filter=None):
+    def apply_processor(self, type, doc, output_xpath_filter=None):
         processor = self.processors[type]
 
         # XXX TO CLEAN UP
         filepath = os.path.join(sfatables_config, 'processors', processor)
         # XXX
 
+        print filepath
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
-        doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
         if (output_xpath_filter):
             p = result.xpathNewContext()
@@ -30,51 +20,71 @@ class XMLRule:
             if (xpath_result == []):
                 raise Exception("Could not apply processor %s."%processor)
 
-            stylesheet_result = xpath_result[0].content
+            stylesheet_result = xpath_result
             p.xpathFreeContext()
         else:
-            stylesheet_result = style.saveResultToString(result)
+            stylesheet_result = result #style.saveResultToString(result)
 
         style.freeStylesheet()
-        doc.freeDoc()
-        result.freeDoc()
+        #doc.freeDoc()
+        #result.freeDoc()
 
         return stylesheet_result
 
-    def wrap_up(self, rspec):
-        filepath = 'processors/' + self.final_processor
+    def wrap_up(self, doc):
+        filepath = os.path.join(sfatables_config, 'processors', self.final_processor)
+
+        if not os.path.exists(filepath):
+            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()
 
         return stylesheet_result
 
     def match(self, rspec):
         match_result = self.apply_processor('match',rspec,"//result/@verdict") 
-        return (match_result=='True')
+        return (match_result[0].content=='True')
 
     def target(self, rspec):
         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')
+            matchNode.addChild(self.arguments['match'])
+            targetNode = libxml2.newNode('target-context')
+            targetNode.addChild(self.arguments['target'])
+            context[0].addChild(matchNode)
+            context[0].addChild(targetNode)
+        p.xpathFreeContext()
+
+        return doc
+
     def apply_interpreted(self, 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):
@@ -113,6 +123,16 @@ class XMLRule:
         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_rule_wrap_up__.xsl'
+
+        self.arguments = {'match':None,'target':None}
+        self.processors = {'match':None,'target':None}
+        self.context = {'match':None,'target':None}
+
         if (chain and rule_number):
             self.load_xml_extension('match', chain, rule_number)
             self.load_xml_extension('target',chain, rule_number)