[Orca-users] Re: subgroups?

[Mark Ching]

Thanks!  I just realized I didn't know a good way to send that.  Here is 
the diff.

Mark


Mark Ching wrote:
 >
 > I was able to edit the web page out put to make a
 > group for orcallator and a group for procallator.

Mark,

Can you send a diff between your version and the original
version?

Use the command

diff -u original_version marks_version > patch.txt

and email patch.txt to the list.

This is the standard way to distribute and see changes in
programs.

Best,
Blair

-- 
Blair Zajac <blair at orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/

-------------- next part --------------
--- bin/orca	Thu Oct 17 22:12:27 2002
+++ orca.orig	Thu Oct 17 22:13:55 2002
@@ -1,5 +1,4 @@
-#!/tool/adclocal/bin/perl  
-# -*- perl -*-
+#!/bin/perl -w # -*- perl -*-
 
 require 5.004_01;
 
@@ -504,7 +503,7 @@
   # span images (i.e., daily, monthly, etc).
 
   # This variable sets the number of groups to place into a single row.
-  my $table_number_columns = 10;
+  my $table_number_columns = 9;
   my @table_columns;
 
   # Go through each subgroup.  If there is only one subgroup and that
@@ -515,19 +514,12 @@
   foreach my $group_name (keys %$subgroup_fids_ref) {
     $number_subgroups += keys %{$subgroup_fids_ref->{$group_name}};
   }
-  $index_html->print("<h2>Available Targets</h2>\n\n<table>\n\n");
+  $index_html->print("<h2>Available Targets</h2>\n\n<table>\n");
   foreach my $group_name (sort keys %$subgroup_fids_ref) {
-###ADDED BY MAC
-    if (my $current_group ne $group_name) {
-	$current_group=$group_name;
-	$index_html->print("<tr valign=top>" . join('', @table_columns) . "</tr>\n");
-        $index_html->print("</table>\n\n<a name=\"$group_name.host\"><h3>$group_name</h3><table>\n\n");
-	@table_columns=();
-    }
-###END OF ADDED LINES BY MAC FOR NOW
     foreach my $subgroup_name (sort sort_subgroup_names keys
                                %{$subgroup_fids_ref->{$group_name}}) {
       my $html_subgroup_name = ($number_subgroups == 1 and !$subgroup_name) ? 'Everything' : $subgroup_name;
+
       # Create the HTML code for the main index.html file.
       my $subgroup_basename = escape_name($html_subgroup_name);
       my $element = "<table border=2><tr><td><b>$html_subgroup_name</b></td></tr>\n<tr><td>\n";
@@ -538,6 +530,7 @@
       }
       $element .= "<a href=\"$subgroup_basename-all.html\">All</a></td></tr>\n";
       $element .= "</table>\n\n";
+
       push(@table_columns, "<td>$element</td>");
       if (@table_columns == $table_number_columns) {
         $index_html->print("<tr valign=top>" . join('', @table_columns) . "</tr>\n");
@@ -643,6 +636,7 @@
   # images that show that plot.  Use the @images_by_type array to keep
   # the ordering in the type of images and the %images_by_type to hold
   # references to an array for each type of image.
+  $index_html->print("<table>\n");
 
   # This sets the number of plot types to place into a single row in
   # the main index.html.
@@ -759,17 +753,6 @@
           $element .= Capatialize($plot_type) . "</a></td>\n";
         }
         push(@table_columns, $element);
-###ADDED BY MAC
-	if ( $legend_no_subgroup =~ /^Average # Processes in Run Queue/) {
-	  if ( $legend_no_subgroup =~ /CPUs$/ ){
-  	    $index_html->print("</table><A name=\"procallator.stat\"><h3>Procallator Linux Stats</h3><table>\n");
-	  }  	    
-	  elsif ( $legend_no_subgroup =~ /Average\)$/ ) { 
-  	    $index_html->print("<table><A name=\"orcallator.stat\"><h3>Orcallator Sun Stats</h3>\n");
-	  }  
-        }
-###END OF ADD
-
         if (@table_columns == $table_number_columns) {
           $index_html->print("<tr>" . join('', @table_columns) . "</tr>\n");
           @table_columns = ();
@@ -807,6 +790,7 @@
       my $name     = $image->name;
       my $subgroup = $image->subgroup_name;
       my $href     = "href=\"$with_subgroup_name.html\"";
+
       my @legend_html_files = @{$legend_html_files{$legend_no_subgroup}};
       $legend_html_files[-1]{fd}->print("<hr>\n<h2><a ${href} name=\"$subgroup\">$subgroup $legend_no_subgroup</a></h2>\n");
       for (my $i=0; $i<@legend_html_files-1; ++$i) {