X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fxmlrule.py;h=ff3b3ef02f8a314e7cc93f5115b59fcadc737b4c;hb=45e7d08515e7713e8d057e3f958dd837f5a2a322;hp=bd41dbfccf0f9b0664bb0978edd627ccd7d26010;hpb=740ac677f9029cbd5697ff7e29330d0c30fd63d4;p=sfa.git

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index bd41dbfc..ff3b3ef0 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 >>sys.stderr, "WARNING, could not import libxslt"
+
+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
@@ -85,12 +90,12 @@ class XMLRule:
         #       else rspec
         
         if (self.match(rspec)):
-            return (True,self.wrap_up(self.target(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