remove sfa upcalls

[plcapi.git] / PLC / Methods / AddNode.py

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index b722585..8403162 100644 (file)
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -1,4 +1,5 @@
 # $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Auth import Auth
 from PLC.Method import Method
@@ -27,7 +28,8 @@ class AddNode(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    accepted_fields = Row.accepted_fields(can_update, [Node.fields,Node.tags])
+    accepted_fields = Row.accepted_fields(can_update,Node.fields)
+    accepted_fields.update(Node.tags)
 
     accepts = [
         Auth(),
@@ -40,10 +42,10 @@ class AddNode(Method):
 
     def call(self, auth, site_id_or_login_base, node_fields):
 
-        node_fields = Row.check_fields (node_fields, self.accepted_fields)
-
         [native,tags,rejected]=Row.split_fields(node_fields,[Node.fields,Node.tags])
 
+        # type checking
+        native = Row.check_fields(native, self.accepted_fields)
         if rejected:
             raise PLCInvalidArgument, "Cannot add Node with column(s) %r"%rejected
 
@@ -80,8 +82,8 @@ class AddNode(Method):
             else:
                 UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],value)
 
-       self.event_objects = {'Site': [site['site_id']],
+        self.event_objects = {'Site': [site['site_id']],
                             'Node': [node['node_id']]} 
-       self.message = "Node %s created" % node['node_id']
-
+        self.message = "Node %s created" % node['node_id']
+        
         return node['node_id']