Changeset 15954 for trunk/ippMonitor/scripts/generate

Timestamp:

Dec 28, 2007, 10:04:27 PM (18 years ago)

Author:

eugene

Message:

adding formats to fields, minor updates

File:

• trunk/ippMonitor/scripts/generate (modified) (7 diffs)

trunk/ippMonitor/scripts/generate

@@ -45 +45 @@
         # list of the table fields
         if ($key eq "FIELD") {
-            ($field, $width, $name, $show, $link, $extras) = split (/,\s+/, $value, 6);
+            ($field, $width, $format, $name, $show, $link, $extras) = split (/,\s+/, $value, 7);
             if (! $name) { die "table $ARGV[0] missing required elements\n"; }
             # ($field) = $field =~ m|\s*(\S+)\s*|;
 
-            if ($VERBOSE) { printf "%-20s %-20s %-20s %-20s %-20s\n", $field, $name, $show, $link, $extras; }
+            if ($VERBOSE) { printf "%-20s %-20s %-20s %-20s %-20s %-20s\n", $field, $name, $format, $show, $link, $extras; }
+
             if ($show eq "") {$show = "value";}
             push @field,   $field;
             push @width,   $width;
+            push @format,  $format;
             push @name,    $name;
             push @show,    $show;
@@ -244 +246 @@
     if (@tdClasses == 0) { return; }
     foreach $tdClass (@tdClasses) {
-        print STDERR "write TD CLASS: $tdClass...\n";
 
         # TD_CLASS class field expression
@@ -254 +255 @@
         printf FILE "    \$class = \"$class\";\n";
         printf FILE "  }\n";
-
-        printf STDERR "  if ($field $testline) {\n";
-        printf STDERR "    \$class = \"$class\";\n";
-        printf STDERR "  }\n";
     }
 }
@@ -308 +305 @@
             # print the actual table cell line with the link...
             if (! $value && ($field[$i] ne "*")) { $value = "\$row[$Nrow]"; }
-            printf FILE "  write_table_cell (\$class, $myLink, $value);\n";
+            print FILE "  write_table_cell (\$class, '$format[$i]', $myLink, $value);\n";
             next;
         }
@@ -322 +319 @@
                 $myLink = "\"\"";
             }
-            printf FILE "  write_table_cell (\$class, $myLink, $ops{$value});\n";
+            print FILE "  write_table_cell (\$class, '$format[$i]', $myLink, $ops{$value});\n";
             next;
         }
@@ -526 +523 @@
 
     $opline = "";
+    @outwords = ();
+    @outfields = ();
     foreach $word (@words) {
         $fword = &parse_fieldname ($word);
@@ -538 +537 @@
     $outline = join (" ", @outfields);
     $opf{$name} = $outline;
+
+    # print "ops: $name : $ops{$name}\n";
+    # print "opf: $name : $opf{$name}\n";
 
     return 1;