X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=9c43e0f8765a0bdb9ed157f084519057369a747c;hb=7c7b4138dc8c6183f68e78e64eb616a1fdbafcbc;hp=258e75a1c2eadf375e437b93a50a19aa46342df3;hpb=3911c6d97e010f6cf8faed8fc9800a90028d7aea;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 258e75a1..9c43e0f8 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -1,4 +1,5 @@
 import libxml2
+import libxslt
 from sfatables.globals import *
 
 class XMLRule:
@@ -11,30 +12,42 @@ class XMLRule:
     processors = {'match':None,'target':None}
     context = {'match':None,'target':None}
 
-    def apply_processor(self, type, rspec):
+    def apply_processor(self, type, rspec, output_xpath_filter=None):
         processor = self.processors[type]
 
         # XXX TO CLEAN UP
         filepath = 'processors/' + processor
         # XXX
 
-        styledoc = libxml2.parseFile(processor)
+        styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
         doc = libxml2.parseDoc(rspec)
         result = style.applyStylesheet(doc, None)
-        processed_result = style.saveResultToString(result, 0)
+        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[0].content
+            p.xpathFreeContext()
+        else:
+            stylesheet_result = style.saveResultToString(result)
         style.freeStylesheet()
         doc.freeDoc()
         result.freeDoc()
 
+
         return stylesheet_result
 
     def match(self, rspec):
-        match_result = self.apply_processor('match',rspec) 
+        import pdb
+        pdb.set_trace()
+        match_result = self.apply_processor('match',rspec,"//result/@verdict") 
         return (match_result=='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):