now parses correctly some args (empty array and empty string)

[plcapi.git] / PLC / NetworkMethods.py

diff --git a/PLC/NetworkMethods.py b/PLC/NetworkMethods.py
index a3d306b..a54934d 100644 (file)
--- a/PLC/NetworkMethods.py
+++ b/PLC/NetworkMethods.py
@@ -4,8 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: NetworkMethods.py,v 1.3 2006/10/24 20:02:22 mlhuang Exp $
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
@@ -19,22 +17,22 @@ class NetworkMethod(Row):
 
     table_name = 'network_methods'
     primary_key = 'method'
-    join_tables = ['nodenetworks']
+    join_tables = ['interfaces']
     fields = {
         'method': Parameter(str, "Network method", max = 20),
         }
 
     def validate_method(self, name):
-       # Make sure name is not blank
+        # Make sure name is not blank
         if not len(name):
             raise PLCInvalidArgument, "Network method must be specified"
-       
-       # Make sure network method does not alredy exist
-       conflicts = NetworkMethods(self.api, [name])
+
+        # Make sure network method does not alredy exist
+        conflicts = NetworkMethods(self.api, [name])
         if conflicts:
             raise PLCInvalidArgument, "Network method name already in use"
 
-       return name
+        return name
 
 class NetworkMethods(Table):
     """
@@ -46,8 +44,8 @@ class NetworkMethods(Table):
 
         sql = "SELECT %s FROM network_methods" % \
               ", ".join(NetworkMethod.fields)
-        
+
         if methods:
-            sql += " WHERE method IN (%s)" % ", ".join(map(api.db.quote, methods))
+            sql += " WHERE method IN (%s)" % ", ".join( [ api.db.quote (m) for m in methods ] )
 
         self.selectall(sql)