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

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index e21f9d86..ff3b3ef0 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -1,10 +1,11 @@
+import sys,os
+
 import libxml2
 # allow to run sfa2wsdl if this is missing (for mac)
-import sys
 try:import libxslt
 except: print >>sys.stderr, "WARNING, could not import libxslt"
 
-from sfatables.globals import *
+from sfatables.globals import sfatables_config
 
 class XMLRule:
     def apply_processor(self, type, doc, output_xpath_filter=None):
@@ -60,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
@@ -88,14 +89,13 @@ class XMLRule:
         #       then target(target_args, rspec)
         #       else rspec
         
-        import pdb
         if (self.match(rspec)):
             return (True,self.wrap_up(self.target(rspec)))
         else:
             return (False,self.wrap_up(rspec))
 
 
-    def apply_compiled(rspec):
+    def apply_compiled(self, rspec):
         # Not supported yet
         return None