X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=52bea31e8c4fb46e7306fb5d3803a8d570e88170;hb=b436db52dc72f2c2e0f271b4d164f477c7672845;hp=4714185a47a9c3404d7e4d7135310dc5e25492eb;hpb=0d45168e3193ee97adccbf261cffacb28a63fcf7;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 4714185a..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:
@@ -77,8 +76,6 @@ class XMLRule:
         return doc
 
     def apply_interpreted(self, rspec):
-        import pdb
-        pdb.set_trace()
         rspec = self.add_rule_context_to_rspec(rspec)
         # Interpreted
         #
@@ -87,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):
@@ -115,8 +113,6 @@ class XMLRule:
         self.processors[type] = processor[0].content
         self.arguments[type] = p.xpathEval('//rule//argument[value!=""]')
 
-        import pdb
-        pdb.set_trace()
         p.xpathFreeContext()