Changeset 11883

Timestamp:

2006-05-30T13:43:51+12:00 (18 years ago)

Author:

mdewsnip

Message:

Added a missing </table> tag to the end of static browsers, removed a couple of unused variables, and split a lot of write_static_browser_macros() into a new write_static_browser_macros_chunk().

File:

• trunk/cic-hcap/perllib/plugins/CICPlug.pm (modified) (3 diffs)

trunk/cic-hcap/perllib/plugins/CICPlug.pm

@@ -886 +886 @@
     my $name_to_id_mapping = shift(@_);
     my $id_to_extra_mapping = shift(@_);
-    my $table_columns = 2;
 
     print BROWSER_MACROFILE "package $static_browser_package_name\n\n";
@@ -911 +910 @@
 
     foreach my $letter (sort(keys %letter_to_name_mapping)) {
-    print BROWSER_MACROFILE "<tr><td width=\"50%\"><br /><a name=\"$letter\"/><span style=\"color: black;\"><b>$letter</b></span></td><td width=\"50%\"></td></tr>\n";
-
     my @letter_names = sort(@{$letter_to_name_mapping{$letter}});
-    my $half_point = ((scalar(@letter_names) % 2 == 0) ? scalar(@letter_names) / 2 : (scalar(@letter_names) + 1) / 2);
-    for (my $i = 0; $i < $half_point; $i++) {
-        print BROWSER_MACROFILE "<tr>";
-
-        my $name = $letter_names[$i];
-        my $id = $name_to_id_mapping->{$name};
-        my $extra = "";
+    &write_static_browser_macros_chunk($letter, \@letter_names, $name_to_id_mapping, $id_to_extra_mapping);
+    }
+
+    print BROWSER_MACROFILE "</table>\n";
+    print BROWSER_MACROFILE "}\n";
+}
+
+
+sub write_static_browser_macros_chunk
+{
+    my $chunk_title = shift(@_);
+    my $chunk_names_ref = shift(@_);
+    my $name_to_id_mapping = shift(@_);
+    my $id_to_extra_mapping = shift(@_);
+
+    print BROWSER_MACROFILE "<tr><td width=\"50%\"><br /><a name=\"$chunk_title\"/><span style=\"color: black;\"><b>$chunk_title</b></span></td><td width=\"50%\"></td></tr>\n";
+
+    my @chunk_names = @{$chunk_names_ref};
+    my $half_point = ((scalar(@chunk_names) % 2 == 0) ? scalar(@chunk_names) / 2 : (scalar(@chunk_names) + 1) / 2);
+    for (my $i = 0; $i < $half_point; $i++) {
+    print BROWSER_MACROFILE "<tr>";
+
+    my $name = $chunk_names[$i];
+    my $id = $name_to_id_mapping->{$name};
+    my $extra = "";
+    if (defined($id_to_extra_mapping)) {
+        $extra = $id_to_extra_mapping->{$id};
+    }
+    print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
+
+    $name = $chunk_names[$i+$half_point];
+    if (defined($name)) {
+        $id = $name_to_id_mapping->{$name};
+        $extra = "";
         if (defined($id_to_extra_mapping)) {
         $extra = $id_to_extra_mapping->{$id};
         }
         print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
-
-        $name = $letter_names[$i+$half_point];
-        if (defined($name)) {
-        $id = $name_to_id_mapping->{$name};
-        $extra = "";
-        if (defined($id_to_extra_mapping)) {
-            $extra = $id_to_extra_mapping->{$id};
-        }
-        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a>$extra</td>";
-        }
-        else {
-        print BROWSER_MACROFILE "<td></td>";
-        }
-
-        print BROWSER_MACROFILE "</tr>\n";
-    }
-    }
-
-    print BROWSER_MACROFILE "}\n";
+    }
+    else {
+        print BROWSER_MACROFILE "<td></td>";
+    }
+
+    print BROWSER_MACROFILE "</tr>\n";
+    }
 }
 
@@ -953 +965 @@
     my $name_to_id_mapping = shift(@_);
     my $id_to_extra_mapping = shift(@_);
-    my $table_columns = 2;
 
     my $static_browser_macrofile_path = "$ENV{'GSDLHOME'}\\collect\\cic-hcap\\macros\\$static_browser_package_root.dm";