X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fruntime.py;fp=sfatables%2Fruntime.py;h=0c6b8b1ca6340b9a26865ba13d0d55d595df6c2b;hb=94cfe1693332964c414a9dff1756150fe8d47839;hp=05e692a66cc970ef58e09246df95e3c7995323a3;hpb=c5e4e0489a8dd58866cfbec8391a31c20328b33c;p=sfa.git diff --git a/sfatables/runtime.py b/sfatables/runtime.py index 05e692a6..0c6b8b1c 100644 --- a/sfatables/runtime.py +++ b/sfatables/runtime.py @@ -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():