Bug fixes and cleanups

[sfa.git] / sfatables / xmlrule.py

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 258e75a..b700b60 100644 (file)
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -1,40 +1,62 @@
 import libxml2
+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):
+    
+    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(processor)
+        styledoc = libxml2.parseFile(filepath)
+        style = libxslt.parseStylesheetDoc(styledoc)
+        result = style.applyStylesheet(doc, None)
+        if (output_xpath_filter):
+            p = result.xpathNewContext()
+            xpath_result = p.xpathEval(output_xpath_filter)
+            if (xpath_result == []):
+                raise Exception("Could not apply processor %s."%processor)
+
+            stylesheet_result = xpath_result
+            p.xpathFreeContext()
+        else:
+            stylesheet_result = result #style.saveResultToString(result)
+
+        style.freeStylesheet()
+        #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)
+        #doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
-        processed_result = style.saveResultToString(result, 0)
+        stylesheet_result = style.saveResultToString(result)
         style.freeStylesheet()
         doc.freeDoc()
         result.freeDoc()
 
+        import pdb
+        pdb.set_trace()
         return stylesheet_result
 
     def match(self, rspec):
-        match_result = self.apply_processor('match',rspec) 
-        return (match_result=='True')
+        match_result = self.apply_processor('match',rspec,"//result/@verdict") 
+        return (match_result[0].content=='True')
 
     def target(self, rspec):
-        target_result = self.apply_processor('target',rspec)
+        target_result = self.apply_processor('target',rspec,None)
         return target_result
 
     def apply_interpreted(self, rspec):
@@ -86,13 +108,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):