X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=52bea31e8c4fb46e7306fb5d3803a8d570e88170;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=97940de2d1d028d6ff723d13a3017e268919ac13;hpb=9a053166cdb0187d0514403e92e8719d9a3aa8ee;p=sfa.git diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py index 97940de2..52bea31e 100644 --- a/sfatables/xmlrule.py +++ b/sfatables/xmlrule.py @@ -10,7 +10,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,7 +56,7 @@ class XMLRule: def add_rule_context_to_rspec(self, doc): p = doc.xpathNewContext() - context = p.xpathEval("//Rspec") + context = p.xpathEval("//RSpec") if (not context): raise Exception('Request is not an rspec') else: @@ -85,10 +84,11 @@ class XMLRule: # then target(target_args, rspec) # else rspec + import pdb 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):