X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fruntime.py;h=b76ec0a8dda631b20081a977dd01e70cbfcb98e8;hb=38e28ae142af328b236b4200da6b07ffc3f44887;hp=e948d0510b5475d8bd7741938597a2e75e272de6;hpb=429e5214b5e839964e10d540bea97480fb6fcd74;p=sfa.git

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index e948d051..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,18 +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)
-            intermediate_rspec = XMLRule().wrap_up(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():