Changeset 28794 for branches/eam_branches/ipp-20100621/ippMonitor/scripts/generate

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/ippMonitor/scripts/generate (modified) (9 diffs)

branches/eam_branches/ipp-20100621/ippMonitor/scripts/generate

@@ -35 +35 @@
     &init_key ("FIELDS");
     &init_key ("GROUPS");
+    &init_key ("TOPLOT");
+    &init_key ("PLOTTER");
+    &init_key ("PLOTTITLE");
 
     foreach $line (@list) {
@@ -43 +46 @@
         if ($key eq "TABLE") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
         if ($key eq "TYPE")  { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+        if ($key eq "TOPLOT") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+        if ($key eq "PLOTTER") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+        if ($key eq "PLOTTITLE") { 
+            ($value) = $value =~ m|^\s*(.+)\s*$|;
+            $value =~ s/\s/_/g;
+        }
 
         &set_keypair ($key, $value);
@@ -153 +162 @@
     }
 
+    foreach $opword (@opwords) {
+        &parse_opwords ($opword);
+    }
+
     foreach $imagedef (@imagedefs) {
         &parse_imagedef ($imagedef);
-    }
-
-    foreach $opword (@opwords) {
-        &parse_opwords ($opword);
     }
 
@@ -253 +262 @@
 # generate a table header cell (<th> </th>) for each field (show != none)
 sub write_table_header {
-
     # print the table header (field labels)
     print FILE "echo \"<tr><td></td>\\n\";\n";
@@ -438 +446 @@
             next;
         }
+
     }
 }
@@ -617 +626 @@
     ($var, $name, $rule, $camera, $class) = split (" ", $value);
     $name   = &parse_fieldname ($name);
+    if (exists $ops{$name}) {
+        #if OPx was defined, replace it by its value
+        $name = $ops{$name};
+        $name =~ s/\s+//g;
+    }
     $camera = &parse_fieldname ($camera);
     $class  = &parse_fieldname ($class);
@@ -682 +696 @@
         if ($key eq $key[$i]) {
             if ($VERBOSE) { print "found $key: $key[$i]  -- $value[$i] (def: $default)\n"; }
-            if (($default eq "") && ($value[$i] eq "")) { die "missing value for required key $key[$i]\n"; }
+            if (($default eq "") && ($value[$i] eq "")) { die "check_key: missing value for required key $key[$i]\n"; }
             if ($value[$i] eq "") { $value[$i] = $default; }
             return;
@@ -695 +709 @@
         if ($VERBOSE) { print "$key[$i]  -- $value[$i]\n"; }
         if ($line =~ m|\$$key[$i]|) {
-            if ($value[$i] eq "") { die "missing value for required key $key[$i]\n"; }
+            if ($value[$i] eq "") { die "check_keypairs: missing value for required key $key[$i]\n"; }
             $line =~ s|\$$key[$i]|$value[$i]|g;
         }
@@ -708 +722 @@
 # against the expectation at runtime.  for the moment,
 # calculate by hand and add to def.d file
-