remove simplejson dependency

[plcapi.git] / PLC / InitScripts.py

diff --git a/PLC/InitScripts.py b/PLC/InitScripts.py
index 3323dcd..c248c83 100644 (file)
--- a/PLC/InitScripts.py
+++ b/PLC/InitScripts.py
@@ -1,12 +1,9 @@
-# $Id$
-# $URL$
 #
 # Functions for interacting with the initscripts table in the database
 #
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-#
 
 from types import StringTypes
 from PLC.Faults import *
@@ -64,5 +61,13 @@ class InitScripts(Table):
             elif isinstance(initscript_filter, dict):
                 initscript_filter = Filter(InitScript.fields, initscript_filter)
                 sql += " AND (%s) %s" % initscript_filter.sql(api, "AND")
+            elif isinstance(initscript_filter, (int, long)):
+                initscript_filter = Filter(InitScript.fields, {'initscript_id': initscript_filter})
+                sql += " AND (%s) %s" % initscript_filter.sql(api, "AND")
+            elif isinstance(initscript_filter, StringTypes):
+                initscript_filter = Filter(InitScript.fields, {'name': initscript_filter})
+                sql += " AND (%s) %s" % initscript_filter.sql(api, "AND")
+            else:
+                raise PLCInvalidArgument, "Wrong initscript filter %r"%initscript_filter
 
         self.selectall(sql)