More bug fixes...

[sfa.git] / sfatables / xmlrule.py

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 4714185..ea73a4f 100644 (file)
--- 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
         #
@@ -88,9 +85,11 @@ class XMLRule:
         #       else rspec
         
         if (self.match(rspec)):
-            return self.wrap_up(self.target(rspec))
+            print "Matched!"
+            return (True,self.wrap_up(self.target(rspec)))
         else:
-            return self.wrap_up(rspec)
+            print "Not Matched!"
+            return (False,self.wrap_up(rspec))
 
 
     def apply_compiled(rspec):
@@ -115,8 +114,6 @@ class XMLRule:
         self.processors[type] = processor[0].content
         self.arguments[type] = p.xpathEval('//rule//argument[value!=""]')
 
-        import pdb
-        pdb.set_trace()
         p.xpathFreeContext()