X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=c363ab925a42775b45dea4882903e7dcd0bba66b;hb=e57b7150dee76d42fc15f9477a3045e5171c8878;hp=9c43e0f8765a0bdb9ed157f084519057369a747c;hpb=87a26ab8c886fe2fb856b1ebdf035577260b2898;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 9c43e0f8..c363ab92 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -7,6 +7,7 @@ class XMLRule:
     chain = None
     xmldoc = None
     terminal = 0
+    final_processor = '__sfatables_wrap_up__.xsl'
 
     arguments = {'match':None,'target':None}
     processors = {'match':None,'target':None}
@@ -16,7 +17,7 @@ class XMLRule:
         processor = self.processors[type]
 
         # XXX TO CLEAN UP
-        filepath = 'processors/' + processor
+        filepath = os.path.join(sfatables_config, 'processors', processor)
         # XXX
 
         styledoc = libxml2.parseFile(filepath)
@@ -33,16 +34,28 @@ class XMLRule:
             p.xpathFreeContext()
         else:
             stylesheet_result = style.saveResultToString(result)
+
         style.freeStylesheet()
         doc.freeDoc()
         result.freeDoc()
 
+        return stylesheet_result
+
+    def wrap_up(self, rspec):
+        filepath = 'processors/' + self.final_processor
+
+        styledoc = libxml2.parseFile(filepath)
+        style = libxslt.parseStylesheetDoc(styledoc)
+        doc = libxml2.parseDoc(rspec)
+        result = style.applyStylesheet(doc, None)
+        stylesheet_result = style.saveResultToString(result)
+        style.freeStylesheet()
+        doc.freeDoc()
+        result.freeDoc()
 
         return stylesheet_result
 
     def match(self, rspec):
-        import pdb
-        pdb.set_trace()
         match_result = self.apply_processor('match',rspec,"//result/@verdict") 
         return (match_result=='True')
 
@@ -99,13 +112,12 @@ 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):
+        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):