web: refactor group_detail into to functions

web/pages/mxq/mxq.in

@@ -360,7 +360,71 @@ sub job_status_filter_buttons {
 	return '<p>'.join('&nbsp;|&nbsp;',@r).'</p>';
 }
 
-sub group_detail {
+sub group_details_raw {
+	my ($o)=@_;
+
+	my $group_name=escapeHTML($o->{'group_name'});
+	my $job_command=escapeHTML($o->{'job_command'});
+	my $group_status_text=group_status($o->{'group_status'});
+
+	return <<"__EOF__"
+<pre>
+group_name     : $group_name
+group_status   : $group_status_text
+group_flags    : $o->{group_flags}
+group_priority : $o->{group_priority}
+
+user_uid       : $o->{user_uid}
+user_name      : $o->{user_name}
+user_gid       : $o->{user_gid}
+user_group     : $o->{user_group}
+
+job_command    : $job_command
+job_threads    : $o->{job_threads}
+job_memory     : $o->{job_memory} MiB
+job_time       : $o->{job_time} minutes
+
+job_max_per_node      : $o->{job_max_per_node}
+
+group_jobs            : $o->{group_jobs}
+group_jobs_inq        : $o->{group_jobs_inq}
+group_jobs_running    : $o->{group_jobs_running}
+group_jobs_finished   : $o->{group_jobs_finished}
+group_jobs_failed     : $o->{group_jobs_failed}
+group_jobs_cancelled  : $o->{group_jobs_cancelled}
+group_jobs_unknown    : $o->{group_jobs_unknown}
+group_jobs_restarted  : $o->{group_jobs_restarted}
+
+group_slots_running:  : $o->{group_slots_running}
+
+group_mtime           : $o->{group_mtime}
+
+group_date_end        : $o->{group_date_end}
+
+stats_max_sumrss                 : $o->{stats_max_sumrss} kiB
+stats_max_maxrss                 : $o->{stats_max_maxrss}
+stats_max_utime_sec              : $o->{stats_max_utime_sec}
+stats_max_stime_sec              : $o->{stats_max_stime_sec}
+stats_max_real_sec               : $o->{stats_max_real_sec}
+
+stats_total_utime_sec            : $o->{stats_total_utime_sec}
+stats_total_stime_sec            : $o->{stats_total_stime_sec}
+stats_total_real_sec             : $o->{stats_total_real_sec}
+stats_total_wait_sec             : $o->{stats_total_wait_sec}
+
+stats_wait_sec                   : $o->{stats_wait_sec}
+stats_run_sec                    : $o->{stats_run_sec}
+stats_idle_sec                   : $o->{stats_idle_sec}
+
+stats_total_utime_sec_finished   : $o->{stats_total_utime_sec_finished}
+stats_total_stime_sec_finished   : $o->{stats_total_stime_sec_finished}
+stats_total_real_sec_finished    : $o->{stats_total_real_sec_finished}
+stats_total_wait_sec_finished    : $o->{stats_total_wait_sec_finished}
+</pre>
+__EOF__
+}
+
+sub group_details {
 	my ($group_id)=@_;
 	$dbh or db_init();
 
@@ -375,7 +439,7 @@ sub group_detail {
 	my $group_name=escapeHTML($o{group_name});
 	my $job_command=escapeHTML($o{job_command});
 
-	$out.=<<"EOF";
+	$out.=<<"__EOF__";
 <h3>Summary</h3>
 <pre>
 $o{user_name} submitted
@@ -392,71 +456,21 @@ in group "$group_name", the group status is $group_status_text.
 <h3 style="color:blue;">[hide group details]</h3>
 </span>
 <div id="group_details" style="display: none">
-<pre>
-group_name     : $group_name
-group_status   : $group_status_text
-group_flags    : $o{group_flags}
-group_priority : $o{group_priority}
-
-user_uid       : $o{user_uid}
-user_name      : $o{user_name}
-user_gid       : $o{user_gid}
-user_group     : $o{user_group}
-
-job_command    : $job_command
-job_threads    : $o{job_threads}
-job_memory     : $o{job_memory} MiB
-job_time       : $o{job_time} minutes
-
-job_max_per_node      : $o{job_max_per_node}
-
-group_jobs            : $o{group_jobs}
-group_jobs_inq        : $o{group_jobs_inq}
-group_jobs_running    : $o{group_jobs_running}
-group_jobs_finished   : $o{group_jobs_finished}
-group_jobs_failed     : $o{group_jobs_failed}
-group_jobs_cancelled  : $o{group_jobs_cancelled}
-group_jobs_unknown    : $o{group_jobs_unknown}
-group_jobs_restarted  : $o{group_jobs_restarted}
-
-group_slots_running:  : $o{group_slots_running}
-
-group_mtime           : $o{group_mtime}
-
-group_date_end        : $o{group_date_end}
-
-stats_max_sumrss                 : $o{stats_max_sumrss} kiB
-stats_max_maxrss                 : $o{stats_max_maxrss}
-stats_max_utime_sec              : $o{stats_max_utime_sec}
-stats_max_stime_sec              : $o{stats_max_stime_sec}
-stats_max_real_sec               : $o{stats_max_real_sec}
-
-stats_total_utime_sec            : $o{stats_total_utime_sec}
-stats_total_stime_sec            : $o{stats_total_stime_sec}
-stats_total_real_sec             : $o{stats_total_real_sec}
-stats_total_wait_sec             : $o{stats_total_wait_sec}
-
-stats_wait_sec                   : $o{stats_wait_sec}
-stats_run_sec                    : $o{stats_run_sec}
-stats_idle_sec                   : $o{stats_idle_sec}
-
-stats_total_utime_sec_finished   : $o{stats_total_utime_sec_finished}
-stats_total_stime_sec_finished   : $o{stats_total_stime_sec_finished}
-stats_total_real_sec_finished    : $o{stats_total_real_sec_finished}
-stats_total_wait_sec_finished    : $o{stats_total_wait_sec_finished}
-</pre>
+__EOF__
+	$out.=group_details_raw(\%o);
+	$out.=<<'__EOF__';
 </div>
-EOF
+__EOF__
 
-		return $out;
+	return $out;
 }
 
 sub group {
 	my ($group_id,$job_status_filter)=@_;
 
 	my $out=h1('MXQ Group '.$group_id);
 
-	$out.=group_detail($group_id);
+	$out.=group_details($group_id);
 	my $what = defined($job_status_filter) ? job_status($job_status_filter) . ' jobs' : 'Jobs';
 	$out.=h2($what . ' of this group ').job_status_filter_buttons($group_id).job_table_of_group($group_id,$job_status_filter);
 
@@ -541,7 +555,7 @@ stats_nivcsw     : $o{stats_nivcsw}
 </pre>
 EOF
 
-	$out.=group_detail($o{group_id});
+	$out.=group_details($o{group_id});
 
 	return $out;
 }