X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=ff3b3ef02f8a314e7cc93f5115b59fcadc737b4c;hb=31cc4fa991896f000abb106916662923f37bc3a6;hp=d137e4e6d3b28f9363c3dc7457f3f69280ed3629;hpb=429e5214b5e839964e10d540bea97480fb6fcd74;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index d137e4e6..ff3b3ef0 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -1,6 +1,11 @@
+import sys,os
+
 import libxml2
-import libxslt
-from sfatables.globals import *
+# allow to run sfa2wsdl if this is missing (for mac)
+try:import libxslt
+except: print >>sys.stderr, "WARNING, could not import libxslt"
+
+from sfatables.globals import sfatables_config
 
 class XMLRule:
     def apply_processor(self, type, doc, output_xpath_filter=None):
@@ -10,7 +15,6 @@ 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)
@@ -57,15 +61,19 @@ class XMLRule:
 
     def add_rule_context_to_rspec(self, doc):
         p = doc.xpathNewContext()
-        context = p.xpathEval("//rspec")
-        if (not context):
+        context = p.xpathEval("//*")
+        if not context or context[0].name not in ['RSpec', 'rspec']:
             raise Exception('Request is not an rspec')
         else:
             # Add the request context
             matchNode = libxml2.newNode('match-context')
-            matchNode.addChild(self.arguments['match'])
+            for match_argument in self.arguments['match']:
+                matchNode.addChild(match_argument)
+
             targetNode = libxml2.newNode('target-context')
-            targetNode.addChild(self.arguments['target'])
+            for target_argument in self.arguments['target']:
+                targetNode.addChild(target_argument)
+
             context[0].addChild(matchNode)
             context[0].addChild(targetNode)
         p.xpathFreeContext()
@@ -73,7 +81,7 @@ class XMLRule:
         return doc
 
     def apply_interpreted(self, rspec):
-        self.add_rule_context_to_rspec(rspec)
+        rspec = self.add_rule_context_to_rspec(rspec)
         # Interpreted
         #
         # output =
@@ -82,12 +90,12 @@ class XMLRule:
         #       else rspec
         
         if (self.match(rspec)):
-            return self.wrap_up(self.target(rspec))
+            return (True,self.wrap_up(self.target(rspec)))
         else:
-            return self.wrap_up(rspec)
+            return (False,self.wrap_up(rspec))
 
 
-    def apply_compiled(rspec):
+    def apply_compiled(self, rspec):
         # Not supported yet
         return None
 
@@ -107,21 +115,11 @@ class XMLRule:
             self.terminal = 1
         
         self.processors[type] = processor[0].content
-        self.arguments[type] = p.xpathEval('//rule')
+        self.arguments[type] = p.xpathEval('//rule//argument[value!=""]')
 
         p.xpathFreeContext()
 
 
-    def wrap_rspec (self, type, rspec):
-        argument = self.arguments[type]
-        p = rspec.xmldoc.xpathNewContext()
-        root_node = p.xpathEval('/RSpec')
-        if (not root_node or not root_node):
-            raise Exception('An evil aggregate manager sent me a malformed RSpec. Please see the stack trace to identify it.')
-
-        root_node.addChild(arguments[type])
-        return rspec
-
     def __init__(self, chain=None, rule_number=None):
         self.rule_number = None
         self.chain = None