From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Wed, 16 Sep 2009 00:17:50 +0000 (+0000)
Subject: Tweaks to xmlrule and exec.py
X-Git-Tag: sfa-0.9-2~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4e0677d9cbb7a3a1ba2c979f8087f32e530c9e03

Tweaks to xmlrule and exec.py
---

diff --git a/sfatables/exec.py b/sfatables/exec.py
index 303723ee..4afcb48e 100644
--- a/sfatables/exec.py
+++ b/sfatables/exec.py
@@ -34,12 +34,11 @@ def main():
 
     rspec = """
 <rspec>
-    <context-input>
+    <request-context>
         <sfa><user><hrn>plc.princeton.sapan</hrn></user></sfa>
-    </context-input>
+    </request-context>
 
-    <sfatables-input>
-        <rule>
+    <sfatables-rule>
             <argument>
                 <name>hrn</name>
                 <value>plc</value>
@@ -52,8 +51,7 @@ def main():
                 <name>blacklist</name>
                 <value>plc.tp</value>
             </argument>
-        </rule>
-    </sfatables-input>
+    </sfatables-rule>
     <request>
         <nodespec>
             <node name="plc.princeton.planetlab-01"/>
diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 9c43e0f8..92a06e24 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -41,8 +41,6 @@ class XMLRule:
         return stylesheet_result
 
     def match(self, rspec):
-        import pdb
-        pdb.set_trace()
         match_result = self.apply_processor('match',rspec,"//result/@verdict") 
         return (match_result=='True')