X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=92a06e24d237ba4261a7c3a518dd226b164929ea;hb=483772a0716028a34cb98012fbe252ffd445fedf;hp=381b587190dce38d6fdc8a83d3a9c863dfa1cdc0;hpb=f17d257364748630be54d23293c6def022e2a75b;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 381b5871..92a06e24 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -1,4 +1,5 @@
 import libxml2
+import libxslt
 from sfatables.globals import *
 
 class XMLRule:
@@ -11,25 +12,40 @@ class XMLRule:
     processors = {'match':None,'target':None}
     context = {'match':None,'target':None}
 
-    def apply_processor(self, type, rspec):
-        processor = processors[type]
-        styledoc = libxml2.parseFile(processor)
+    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(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) 
+        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):