Author: justi9 Date: 2009-02-02 11:31:48 -0500 (Mon, 02 Feb 2009) New Revision: 3089 Modified: mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/wooly/python/wooly/tables.py Log: Scope the system set under job groups Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2009-01-30 18:50:40 UTC (rev 3088) +++ mgmt/trunk/cumin/python/cumin/job.py 2009-02-02 16:31:48 UTC (rev 3089) @@ -367,9 +367,9 @@ self.__tabs.add_tab(JobGroupStats(app, "stats")) self.__tabs.add_tab(JobGroupJobSet(app, "jobs")) - self.__tabs.add_tab(SystemSet(app, "systems")) + self.__tabs.add_tab(JobGroupSystemSet(app, "systems")) #self.__tabs.add_tab(CuminDetails(app, "details")) - + class JobGroupStats(Widget): def __init__(self, app, name): super(JobGroupStats, self).__init__(app, name) @@ -522,7 +522,24 @@ def render_job_status(self, session, job_group): #return JobStatusInfo.get_status_string(job.JobStatus) return "Status" - + +class JobGroupSystemSet(SystemSet): + def get_args(self, session): + return self.frame.get_args(session) + + def render_sql_where(self, session, group): + subquery = """ + select 1 + from slot as l + join job as j on j.custom_id = l.job_id + where j.custom_group = %(id)s + """ + + return "where exists (%s)" % subquery + + def get_sql_values(self, session, group): + return {"id": group.id} + class JobFrame(CuminFrame): def __init__(self, app, name): super(JobFrame, self).__init__(app, name) Modified: mgmt/trunk/wooly/python/wooly/tables.py =================================================================== --- mgmt/trunk/wooly/python/wooly/tables.py 2009-01-30 18:50:40 UTC (rev 3088) +++ mgmt/trunk/wooly/python/wooly/tables.py 2009-02-02 16:31:48 UTC (rev 3089) @@ -248,8 +248,8 @@ sql = self.render_sql(session, *args) sql_values = self.get_sql_values(session, *args) - #print "SQL TEXT", sql - #print "SQL VALS", sql_values + print "SQL TEXT", sql + print "SQL VALS", sql_values cursor.execute(sql, sql_values)