X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fruntime.py;h=a5363352d6a191e307304754de213012a9f2c2a1;hb=7c2a3e70cb3e12bc102ddb8187e9954552c2140d;hp=8f5c323f7ce1d2cf9245820ee946cc0240e95e3e;hpb=805a8364a6ce7295edb2bad37bd26e12e3dbecac;p=sfa.git

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index 8f5c323f..a5363352 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -50,12 +50,14 @@ class SFATablesRules:
                 childNode = self.create_xml_node(k, context_dict[k])
                 node.addChild(childNode)
             else:
-                node.addContent(context_dict[k])
+                childNode = libxml2.newNode(k)
+                childNode.addContent(context_dict[k])
+                node.addChild(childNode)
         return node
                 
     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:
@@ -65,56 +67,39 @@ class SFATablesRules:
         p.xpathFreeContext()
         return doc
 
-    def add_rule_context_to_rspec(self,arguments, doc):
-        p = doc.xpathNewContext()
-        context = p.xpathEval("//rspec")
-        if (not context):
-            raise Exception('Request is not an rspec')
-        else:
-            # Add the request context
-            ruleNode = libxml2.newNode('rule-context')
-            ac = self.active_context
-            for k in ac:
-                argumentNode = libxml2.newNode('argument')
-                nameNode = libxml2.newNode('name')
-                nameNode.addContent(k)
-                valueNode = libxml2.newNode('value')
-                valueNode.addContent(ac[k])
-                argumentNode.addChild(nameNode)
-                argumentNode.addChild(valueNode)
-                ruleNode.addChild(argumentNode)
-                context[0].addChild(ruleNode)
-        p.xpathFreeContext()
+    
+    def apply(self, rspec):
+        if (self.sorted_rule_list):
+            doc = libxml2.parseDoc(rspec)
+            doc = self.add_request_context_to_rspec(doc)
 
-        return doc
+            intermediate_rspec = doc
 
-    def apply(self, rspec):
-        doc = libxml2.parseDoc(rspec)
-        doc = self.add_request_context_to_rspec(doc)
+            for rule in self.sorted_rule_list:
+                (matched,intermediate_rspec) = rule.apply_interpreted(intermediate_rspec)
+                if (rule.terminal and matched):
+                    break
 
-        intermediate_rspec = doc
+            final_rspec = self.wrap_up(intermediate_rspec) 
+        else:
+            final_rspec = rspec
 
-        for rule in self.sorted_rule_list:
-            import pdb
-            pdb.set_trace()
-            intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
-            intermediate_rspec = XMLRule().wrap_up(intermediate_rspec) 
-            if (rule.terminal):
-                break
-
-        final_rspec = self.wrap_up(intermediate_rspec) 
         return final_rspec
 
+    def print_rules(self):
+        for rule in self.sorted_rule_list:
+            print rule.processors
+
 def main():
     incoming = SFATablesRules('INCOMING')
     incoming.set_context({'sfa':{'user':{'hrn':'plc.princeton.sapanb'}}})
 
     outgoing = SFATablesRules('OUTGOING')
     print "%d rules loaded for INCOMING chain"%len(incoming.sorted_rule_list)
-    print incoming.sorted_rule_list[0].processors
+    incoming.print_rules()
 
     print "%d rules loaded for OUTGOING chain"%len(outgoing.sorted_rule_list)
-    print outgoing.sorted_rule_list[0].processors
+    outgoing.print_rules()
 
     rspec = open(sys.argv[1]).read()
     newrspec = incoming.apply(rspec)