X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FInitScripts.py;h=c248c83c5c2f9c993c660e131b68ba529cd985e4;hb=9aecb8c6fde06136bef94e2fd6fce832dc3c0c10;hp=3323dcd5afa4811b80ed98d7c742b2d842b756d1;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git

diff --git a/PLC/InitScripts.py b/PLC/InitScripts.py
index 3323dcd..c248c83 100644
--- 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)