[Commits] [svn:einsteintoolkit] www/release-info/ (Rev. 681)

knarf at cct.lsu.edu knarf at cct.lsu.edu
Tue Oct 18 13:30:49 CDT 2011


User: knarf
Date: 2011/10/18 01:30 PM

Modified:
 /release-info/
  parse_testsuite_results.cgi

Log:
 use vertical text in table

File Changes:

Directory: /release-info/
=========================

File [modified]: parse_testsuite_results.cgi
Delta lines: +63 -37
===================================================================
--- release-info/parse_testsuite_results.cgi	2011-10-18 17:35:41 UTC (rev 680)
+++ release-info/parse_testsuite_results.cgi	2011-10-18 18:30:48 UTC (rev 681)
@@ -20,8 +20,8 @@
 my $nthreads = 1;
 my %fileinfo = ();
 
-my $too_old = "Sat Oct 01 12:00:00 CDT 2011";
-#my $too_old = "1 week ago";
+#my $too_old = "Sat Oct 01 12:00:00 CDT 2011";
+my $too_old = "3 days ago";
 
 # open each log file one by one
 foreach my $filename (@filenames) {
@@ -128,8 +128,8 @@
     }
   }
 }
-# general table heading
-my $table_entries = "<tr><th rowspan='2'>Thorn</th><th rowspan='2'>Test</th>";
+# host table headings
+my $table_entries = "<tr><th>Thorn</th><th>Test</th>";
 foreach my $host (sort(keys(%allhosts))) {
   my $ncols = 0;
   foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
@@ -137,18 +137,6 @@
       if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/) { $ncols++; } } }
   $table_entries .= "<th colspan='$ncols'><div class='vtext'>$host</div></th>";
 }
-# host table headings
-$table_entries .= "</tr>\n<tr>";
-foreach my $host (sort(keys(%allhosts))) {
-  foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
-    foreach my $nthreads (sort(keys(%{$allhosts{$host}{$nprocs}}))) {
-      if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
-      {
-        $table_entries .= "<th class='c".(($nprocs=="1")?1:2)."'>${nprocs}p, ${nthreads}t</th>";
-      }
-    }
-  }
-}
 $table_entries .= "</tr>\n";
 
 my $not_run = "•";
@@ -197,11 +185,11 @@
               my $details = $results{$thorn}{$test}{$host}{$nprocs}{$nthreads}{"details"};
               my $entry = "<b>$details</b>";
               if ($details =~ /(\d+) files compared, (\d+) differ, (\d+) differ significantly/) {
-                $entry = "<font color='#$red'><b>$3</b></font>/$1";
+                $entry = "<div class='vtext vtext3'><font color='#$red'><b>$3</b></font>/$1</div>";
               }
               if ($details =~ /(\d+) files missing, (\d+) files compared, (\d+) differ/) {
-                $entry = "<font color='#$red'><b>$1</b></font>&nbsp;N/A, ".
-                         "<font color='#$red'><b>$3</b></font>/$2";
+                $entry = "<div class='vtext vtext7'><font color='#$red'><b>$1</b></font>&nbsp;N/A, ".
+                                            "<font color='#$red'><b>$3</b></font>/$2</div>";
               }
               $table_entries .= "<td class='c$bg'>$entry$popup</td>";
             }
@@ -217,7 +205,7 @@
 }
 
 # Things for the top of the table
-my $table_entries_h .= "<tr><th rowspan='4' colspan='2'>Totals</th>";
+my $table_entries_h .= "<tr><th colspan='2'>Totals</th>";
 foreach my $host (sort(keys(%allhosts))) {
   my $ncols = 0;
   foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
@@ -225,32 +213,63 @@
       if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/) { $ncols++; } } }
   $table_entries_h .= "<th colspan='$ncols'><div class='vtext'>$host</div></th>";
 }
-$table_entries_h .= "</tr>\n<tr>";
+$table_entries_h .= "</tr>\n<tr><th colspan='2'>processes</th>";
 foreach my $host (sort(keys(%allhosts))) {
   foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
    foreach my $nthreads (sort(keys(%{$allhosts{$host}{$nprocs}}))) {
     if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
     {
-      $table_entries_h .= "<th class='c".(($nprocs=="1")?1:2)."'>${nprocs}p, ${nthreads}t</th>";
+      $table_entries_h .= "<td class='c".(($nprocs=="1")?1:2)."'><div class='vtext vtext1'>${nprocs}</div></td>";
     }
    }
   }
 }
-$table_entries_h .= "</tr><tr>\n";
+$table_entries_h .= "</tr>\n<tr><th colspan='2'>threads</th>";
 foreach my $host (sort(keys(%allhosts))) {
   foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
    foreach my $nthreads (sort(keys(%{$allhosts{$host}{$nprocs}}))) {
     if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
     {
+      $table_entries_h .= "<td class='c".(($nprocs=="1")?1:2)."'><div class='vtext vtext1'>${nthreads}</div></td>";
+    }
+   }
+  }
+}
+$table_entries_h .= "</tr><tr><th colspan='2'>user</th>\n";
+foreach my $host (sort(keys(%allhosts))) {
+  foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
+   foreach my $nthreads (sort(keys(%{$allhosts{$host}{$nprocs}}))) {
+    if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
+    {
       $table_entries_h .= "<td class='c".(($nprocs=="1")?1:2)."'>";
       if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
       {
         if (defined($fileinfo{$host}) and defined($fileinfo{$host}{$nprocs}) and
             defined($fileinfo{$host}{$nprocs}{$nthreads}) and
-            defined($fileinfo{$host}{$nprocs}{$nthreads}{"time"}) and
             defined($fileinfo{$host}{$nprocs}{$nthreads}{"user"})) {
-          $table_entries_h .= "<div class='vtext'>".
-                              $fileinfo{$host}{$nprocs}{$nthreads}{"user"}."&nbsp;".
+          $table_entries_h .= "<div class='vtext vtext5'>".
+                              $fileinfo{$host}{$nprocs}{$nthreads}{"user"}.
+                              "</div>";
+        } else { $table_entries_h .= "&nbsp;"; }
+      }
+      $table_entries_h .= "</td>";
+     }
+   }
+  }
+}
+$table_entries_h .= "</tr><tr><th colspan='2'>time</th>\n";
+foreach my $host (sort(keys(%allhosts))) {
+  foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
+   foreach my $nthreads (sort(keys(%{$allhosts{$host}{$nprocs}}))) {
+    if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
+    {
+      $table_entries_h .= "<td class='c".(($nprocs=="1")?1:2)."'>";
+      if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
+      {
+        if (defined($fileinfo{$host}) and defined($fileinfo{$host}{$nprocs}) and
+            defined($fileinfo{$host}{$nprocs}{$nthreads}) and
+            defined($fileinfo{$host}{$nprocs}{$nthreads}{"time"})) {
+          $table_entries_h .= "<div class='vtext vtext3'>".
                               UnixDate($fileinfo{$host}{$nprocs}{$nthreads}{"time"}, "%m/%d").
                               "</div>";
         } else { $table_entries_h .= "&nbsp;"; }
@@ -260,15 +279,15 @@
    }
   }
 }
-$table_entries_h .= "</tr><tr>\n";
+$table_entries_h .= "</tr><tr><th colspan='2'>failing / succeeding</th>\n";
 foreach my $host (sort(keys(%allhosts))) {
   foreach my $nprocs (sort(keys(%{$allhosts{$host}}))) {
    foreach my $nthreads (sort(keys(%{$allhosts{$host}{$nprocs}}))) {
     if (!defined($ignore) or "$nprocs,$nthreads" !~ /$ignore/)
     {
-      $table_entries_h .= "<td class='c".(($nprocs=="1")?1:2)."'><b>".
+      $table_entries_h .= "<td class='c".(($nprocs=="1")?1:2)."'><div class='vtext vtext3'><b>".
                           $allhosts{$host}{$nprocs}{$nthreads}{"fail"}."</b>/".
-                          $allhosts{$host}{$nprocs}{$nthreads}{"ran"}."</td>";
+                          $allhosts{$host}{$nprocs}{$nthreads}{"ran"}."</div></td>";
      }
    }
   }
@@ -327,15 +346,22 @@
                    color        : #000000;
                    background-color: #ffffff;
                  }
-  th div.vtext {
-//    -webkit-transform: rotate(-90deg);
-//    -moz-transform: rotate(-90deg);
-//    margin-top: 10em;
-//    padding-bottom: 1em;
-//    white-space: nowrap;
-//    width: 10em;
-//    text-align: left;
+  div.vtext {
+    -webkit-transform: rotate(-90deg);
+    -moz-transform: rotate(-90deg);
+    margin-left:auto;
+    margin-right:auto;
+    margin-top: 10em;
+    text-align: left;
+    padding-bottom: 0em;
+    white-space: nowrap;
+    width: 1em;
+    vertical-align: middle;
   }
+  div.vtext1 { margin-top: 1em; }
+  div.vtext3 { margin-top: 3em; }
+  div.vtext5 { margin-top: 5em; }
+  div.vtext7 { margin-top: 7em; }
 
 </style>
 CSS



More information about the Commits mailing list