X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfatables%2Fxmlrule.py;h=a72a480ecc7a675f3d977978a125935d7bfc1500;hb=c451060afdf4ef60cdfea767ba6f00d6ffce66f8;hp=5eb5891186337c51e0042c6b3946092f1adfbb1e;hpb=50d80230b924e20e028ed3c0f13ddd6f98cfbe54;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 5eb58911..a72a480e 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -3,16 +3,6 @@ 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, doc, output_xpath_filter=None):
         processor = self.processors[type]
 
@@ -20,6 +10,7 @@ class XMLRule:
         filepath = os.path.join(sfatables_config, 'processors', processor)
         # XXX
 
+        print filepath
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
         result = style.applyStylesheet(doc, None)
@@ -51,11 +42,13 @@ class XMLRule:
         style = libxslt.parseStylesheetDoc(styledoc)
         #doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
-        stylesheet_result = result #style.saveResultToString(result)
+        stylesheet_result = style.saveResultToString(result)
         style.freeStylesheet()
-        #doc.freeDoc()
-        #result.freeDoc()
+        doc.freeDoc()
+        result.freeDoc()
 
+        import pdb
+        pdb.set_trace()
         return stylesheet_result
 
     def match(self, rspec):
@@ -116,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)