X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=58a8d4cc587fb4021fbd1745c04053f0939bd714;hb=7f5d4eef337809e0e0e802ca8c0cc8f695dc0837;hp=92a06e24d237ba4261a7c3a518dd226b164929ea;hpb=4e0677d9cbb7a3a1ba2c979f8087f32e530c9e03;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 92a06e24..58a8d4cc 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -3,25 +3,16 @@ import libxslt
 from sfatables.globals import *
 
 class XMLRule:
-    rule_number = None
-    chain = None
-    xmldoc = None
-    terminal = 0
-
-    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 = 'processors/' + processor
+        filepath = os.path.join(sfatables_config, 'processors', processor)
         # XXX
 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
-        doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
         if (output_xpath_filter):
             p = result.xpathNewContext()
@@ -29,20 +20,38 @@ 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, doc):
+        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
+
+        styledoc = libxml2.parseFile(filepath)
+        style = libxslt.parseStylesheetDoc(styledoc)
+        #doc = libxml2.parseDoc(rspec)
+        result = style.applyStylesheet(doc, None)
+        stylesheet_result = result #style.saveResultToString(result)
+        style.freeStylesheet()
+        #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)
@@ -97,13 +106,22 @@ class XMLRule:
         root_node.addChild(arguments[type])
         return rspec
 
-    def __init__(self, chain, rule_number):
-
-        self.load_xml_extension('match', chain, rule_number)
-        self.load_xml_extension('target',chain, rule_number)
-        self.rule_number = rule_number
-        self.chain = chain
-
+    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.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)
+            self.rule_number = rule_number
+            self.chain = chain
         return
         
     def free(self):