git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More bug fixes...
[sfa.git]
/
sfatables
/
runtime.py
diff --git
a/sfatables/runtime.py
b/sfatables/runtime.py
index
b76ec0a
..
f9263fb
100644
(file)
--- a/
sfatables/runtime.py
+++ b/
sfatables/runtime.py
@@
-50,7
+50,9
@@
class SFATablesRules:
childNode = self.create_xml_node(k, context_dict[k])
node.addChild(childNode)
else:
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):
return node
def add_request_context_to_rspec(self, doc):
@@
-74,8
+76,8
@@
class SFATablesRules:
intermediate_rspec = doc
for rule in self.sorted_rule_list:
intermediate_rspec = doc
for rule in self.sorted_rule_list:
-
intermediate_rspec
= rule.apply_interpreted(intermediate_rspec)
- if (rule.terminal):
+
(matched,intermediate_rspec)
= rule.apply_interpreted(intermediate_rspec)
+ if (rule.terminal
and matched
):
break
final_rspec = self.wrap_up(intermediate_rspec)
break
final_rspec = self.wrap_up(intermediate_rspec)