X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=b749147d366a63b32e5aa365c6884802a8cac2e6;hp=9e06bbfcac355345f06624b303641459d4f9d81f;hb=HEAD;hpb=8128f65be958a23b27f0c445d22e9bc82279e95b diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py index 9e06bbfc..b749147d 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("WARNING, could not import libxslt", file=sys.stderr) + +from sfatables.globals import sfatables_config class XMLRule: def apply_processor(self, type, doc, output_xpath_filter=None): @@ -56,8 +61,8 @@ 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 @@ -90,7 +95,7 @@ class XMLRule: return (False,self.wrap_up(rspec)) - def apply_compiled(rspec): + def apply_compiled(self, rspec): # Not supported yet return None