Changeset 31816 for trunk/ippMonitor

Timestamp:

Jul 1, 2011, 11:51:24 AM (15 years ago)

Author:

Serge CHASTEL

Message:

Merged LAP monitor into trunk

Location:

trunk/ippMonitor

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (4 diffs)
• def/lapExposures.d (copied) (copied from branches/sc_branches/ippMonitorLap/def/lapExposures.d )
• def/lapRuns.d (copied) (copied from branches/sc_branches/ippMonitorLap/def/lapRuns.d )
• def/lapSequenceSummary.d (copied) (copied from branches/sc_branches/ippMonitorLap/def/lapSequenceSummary.d )
• def/lapStacks.d (copied) (copied from branches/sc_branches/ippMonitorLap/def/lapStacks.d )
• raw/czartool_labels.php (modified) (1 diff)
• raw/ipp.lap.dat (copied) (copied from branches/sc_branches/ippMonitorLap/raw/ipp.lap.dat )
• raw/ipp.lap.php (copied) (copied from branches/sc_branches/ippMonitorLap/raw/ipp.lap.php )
• raw/ipp.menu.dat (modified) (1 diff)
• scripts/generate (modified) (6 diffs)

trunk/ippMonitor/Makefile.in

@@ -33 +33 @@
 $(DESTWWW)/ipp.dist.dat \
 $(DESTWWW)/ipp.dist.php \
+$(DESTWWW)/ipp.lap.dat \
+$(DESTWWW)/ipp.lap.php \
 $(DESTWWW)/ipp.imfiles.dat \
 $(DESTWWW)/ipp.imfiles.php \
@@ -70 +72 @@
 $(DESTWWW)/version.php \
 $(DESTWWW)/show_log.php 
-
-
-
 
 DEFSRC = \
@@ -223 +222 @@
 $(DESTWWW)/minidvodbProcessed.php \
 $(DESTWWW)/addRunRun.php \
-$(DESTWWW)/addRunProcessed.php
-
-
+$(DESTWWW)/addRunProcessed.php \
+$(DESTWWW)/lapSequenceSummary.php \
+$(DESTWWW)/lapRuns.php \
+$(DESTWWW)/lapExposures.php \
+$(DESTWWW)/lapStacks.php
 
 PICTURES = \
@@ -274 +275 @@
         rm -f $(DESTWWW)/version.php
 
+test:
+#DESTWWW := $(DESTWWW)/test
+        echo $(DESTWWW)
+
 $(DESTWWW)/version.php:
         svnversion > $@

trunk/ippMonitor/raw/czartool_labels.php

@@ -135 +135 @@
 echo "<tr><td>Postage stamp server status</td><td><a href=\"http://pstamp.ipp.ifa.hawaii.edu/status.php\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Documentation</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\"><font color=\"blue\">here</font></a></td></tr>";
-echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&c=IPP%2520Production\"><font color=\"blue\">here</font></a></td></tr>";
+echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ipp004.ifa.hawaii.edu/clusterMonitor/top.html\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp004.ifa.hawaii.edu/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";

trunk/ippMonitor/raw/ipp.menu.dat

@@ -23 +23 @@
 menutop   | menutop      | link    | Stack Steps                  | ipp.stack.php
 menutop   | menutop      | link    | Distribution                 | ipp.dist.php
+menutop   | menutop      | link    | Large Area Processing        | ipp.lap.php
 menutop   | menutop      | link    | dvoDB                        | ipp.dvodb.php
 menutop   | menutop      | link    | Calibration                  | ipp.cal.php
 menutop   | menutop      | link    | Plots                        | ipp.plots.php
 menutop   | menutop      | link    | Admin and Debug              | ipp.imfiles.php
-

trunk/ippMonitor/scripts/generate

@@ -61 +61 @@
             if ($field =~ m|\S+\s+as\s+\S+|) {
                 ($fieldreal) = $field =~ m|\S+\s+as\s+(\S+)|;
+                #print STDERR "Case 1\n";
+            } elsif ($field =~ m|\S+\s+AS\s+\S+|) {
+                #print STDERR "field=$field\n";
+                $fieldreal = $field;
+                $fieldreal =~ s/\s+AS.*$//;
+                #($fieldreal) = $field =~ m|\S+\s+as\s+(\S+)|;
+                #print STDERR "Case 2\n";
             } else {
                 $fieldreal = $field;
+                #print STDERR "Case 3\n";
             }
+            #print STDERR "field=[$field]\tfieldreal=[$fieldreal]\n";
 
             if ($VERBOSE) { printf "%-20s %-20s %-20s %-20s %-20s %-20s\n", $field, $name, $format, $show, $link, $extras; }
@@ -527 +536 @@
     @extfields = split (/,/, $extras);
     for ($i = 0; $i < @extfields; $i++) {
+        # print STDERR $extfields[$i],"\n";
         ($label, $value, $outline) = &parse_label ($extfields[$i]);
+        # print STDERR "[",$label,"]","[",$value,"]","[",$outline,"\n";
         print FILE "  \$link = \$link . \"&$outline\";\n";
     }
@@ -540 +551 @@
     ($word, $value) = split (" ", $_[0]);
 
+    # print STDERR "#############################\n";
+    # foreach my $key ( keys %linkarg ) {
+    #   print STDERR "key: $key, value: $linkarg{$key}\n";
+    # }
+
     # print STDERR "0: $_[0], $word, $value\n";
+    # print STDERR "[$linkarg{$word}]\n";
 
     if ($linkarg{$word}) {
+        # print STDERR "Case 1\n";
         $linkarg{$word} = "$linkarg{$word},$value";
     } else {
+        # print STDERR "Case 2\n";
         $linkarg{$word} = $value;
     }
     # print STDERR "linkarg($word) : $linkarg{$word}\n";
+    # print STDERR "#############################\n";
 }
 
@@ -563 +583 @@
     $value = "";
 
+    # print STDERR "### parse_label ###\n";
+    # for ($i = 0; $i < @field; $i++) {
+    #   print STDERR "field[$i]=$field[$i]\n";
+    # }
+    # for ($i = 0; $i < @fieldreal; $i++) {
+    #   print STDERR "fieldreal[$i]=$fieldreal[$i]\n";
+    # }
+    # for ($i = 0; $i < @count; $i++) {
+    #   print STDERR "count[$i]=$count[$i]\n";
+    # }
+
     # search for embedded table fields and replace with row[N]
     if ($VERBOSE) { print STDERR "string: $string\n"; }
     if ($string =~ m|\S+=\S+|) {
         ($label, $value) = $string =~ m|(\S+)=(\S+)|;
+        # print STDERR "value=$value\n";
         if ($value =~ m|^\$|) {
           MATCH_LABEL:
@@ -572 +604 @@
                 if ($field[$i] eq "*") { next; }
                 while ($value =~ m|\$$fieldreal[$i]|) {
-                    # print "field: $fieldreal[$i]\n";
+                    # print STDERR "field: $fieldreal[$i]\n";
                     # ($part1, $name, $part2) = $value =~ m|\$($fieldreal[$i])\@(\S+)|;
                     ($part1, $name, $part2) = $value =~ m|(\S*)\$($fieldreal[$i])(\S*)|;
-                    # print "name: $name\n";
-                    # print "part1: $part1\n";
-                    # print "part2: $part2\n";
-                    # print "value: $value\n";
+                    # print STDERR "name: $name\n";
+                    # print STDERR "part1: $part1\n";
+                    # print STDERR "part2: $part2\n";
+                    # print STDERR "value: $value\n";
 
                     $Nrow = $count[$i];
@@ -587 +619 @@
                     #     $value = "\$row[$Nrow]";
                     # }
-                    # print "outval: $value\n";
+                    # print STDERR  "outval: $value\n";
                     # last MATCH_LABEL;
                 }