Author: eallen Date: 2008-09-03 17:06:39 -0400 (Wed, 03 Sep 2008) New Revision: 2401 Modified: mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/cumin/python/cumin/job.strings Log: Fix sql and item count for jobs joined with schedulers Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2008-09-03 20:16:30 UTC (rev 2400) +++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-03 21:06:39 UTC (rev 2401) @@ -68,9 +68,20 @@ col.alignment = "right" self.add_hidden_column(col) - def render_title(self, session): - return "Jobs %s" % fmt_count(Job.select().count()) + def get_args(self, session): + return self.frame.get_args(session) +# def render_sql_where(self, session, job): +# subquery = \ +# "select 1 from broker_group_mapping " + \ +# "where broker_group_id = %i " % group.id + \ +# "and broker_registration_id = br.id" +# +# return "where exists (%s)" % subquery + + def render_title(self, session, job): + return "Jobs %s" % fmt_count(self.get_item_count(session, job)) + class ArgsColumn(SqlTableColumn): def render_title(self, session, data): return "Arguments" @@ -101,9 +112,12 @@ def render_content(self, session, data): job = Identifiable(data["id"]) - branch = session.branch() - self.frame.show_job(branch, job).show_view(branch) - return fmt_olink(branch, job, name=data[self.name]) + if data[self.name]: + branch = session.branch() + self.frame.show_job(branch, job).show_view(branch) + return fmt_olink(branch, job, name=data[self.name]) + else: + return data[self.name] # none class StatusColumn(SqlTableColumn): def render_title(self, session, data): @@ -133,9 +147,12 @@ def render_content(self, session, data): scheduler = Identifiable(data["scheduler_id"]) - branch = session.branch() - self.frame.show_scheduler(branch, scheduler).show_view(branch) - return fmt_olink(branch, scheduler, name=data["scheduler"]) + if data["scheduler"]: + branch = session.branch() + self.frame.show_scheduler(branch, scheduler).show_view(branch) + return fmt_olink(branch, scheduler, name=data["scheduler"]) + else: + return data["scheduler"] class CommandColumn(SqlTableColumn): def render_title(self, session, data): Modified: mgmt/trunk/cumin/python/cumin/job.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/job.strings 2008-09-03 20:16:30 UTC (rev 2400) +++ mgmt/trunk/cumin/python/cumin/job.strings 2008-09-03 21:06:39 UTC (rev 2401) @@ -18,7 +18,7 @@ from job as j left outer join job_stats as c on c.id = j.stats_curr_id left outer join job_stats as p on p.id = j.stats_prev_id -left outer join scheduler as s on s.id = j.scheduler_id +inner join scheduler as s on s.id = j.scheduler_id {sql_where} {sql_orderby} {sql_limit} @@ -26,7 +26,7 @@ [JobSet.count_sql] select count(1) from job as j -left outer join job_stats as c on c.id = j.stats_curr_id +inner join scheduler as s on s.id = j.scheduler_id {sql_where}