X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fruntime.py;h=b76ec0a8dda631b20081a977dd01e70cbfcb98e8;hb=73b163a7ea35209e0675a7c7cef367946928a96f;hp=05e692a66cc970ef58e09246df95e3c7995323a3;hpb=0d45168e3193ee97adccbf261cffacb28a63fcf7;p=sfa.git

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index 05e692a6..b76ec0a8 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -55,7 +55,7 @@ class SFATablesRules:
                 
     def add_request_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:
@@ -67,17 +67,21 @@ class SFATablesRules:
 
     
     def apply(self, rspec):
-        doc = libxml2.parseDoc(rspec)
-        doc = self.add_request_context_to_rspec(doc)
+        if (self.sorted_rule_list):
+            doc = libxml2.parseDoc(rspec)
+            doc = self.add_request_context_to_rspec(doc)
 
-        intermediate_rspec = doc
+            intermediate_rspec = doc
 
-        for rule in self.sorted_rule_list:
-            intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
-            if (rule.terminal):
-                break
+            for rule in self.sorted_rule_list:
+                intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
+                if (rule.terminal):
+                    break
+
+            final_rspec = self.wrap_up(intermediate_rspec) 
+        else:
+            final_rspec = rspec
 
-        final_rspec = self.wrap_up(intermediate_rspec) 
         return final_rspec
 
 def main():