Bug fixes and cleanups

[sfa.git] / sfatables / xmlrule.py

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 55796a9..b700b60 100644 (file)
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -3,17 +3,8 @@ 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
@@ -22,7 +13,6 @@ class XMLRule:
 
         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,38 +20,40 @@ 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):
+    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 rspec
+            return doc#rspec
 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
-        doc = libxml2.parseDoc(rspec)
+        #doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
         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,"//result/@verdict") 
-        return (match_result=='True')
+        return (match_result[0].content=='True')
 
     def target(self, rspec):
         target_result = self.apply_processor('target',rspec,None)
@@ -117,6 +109,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_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)