Changeset 11887

Timestamp:

2006-05-30T14:02:16+12:00 (18 years ago)

Author:

mdewsnip

Message:

Rewrote write_state_browser_macrofile() to use the new write_static_browser_macros_chunk().

File:

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

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

@@ -231 +231 @@
 
     # Create a document object for each institution
-    my %institution_state_to_name_mapping;
+    my %institution_state_to_names_mapping;
     my %institution_name_to_id_mapping;
     while (my $row_hashref = $institution_sql_handle->fetchrow_hashref) {
@@ -355 +355 @@
     $institution_name_to_id_mapping{$institution_name} = $institution_doc_obj->get_OID();
     my $institution_state = $row_hashref->{"State"};
-    push(@{$institution_state_to_name_mapping{$institution_state}}, $institution_name);
+    push(@{$institution_state_to_names_mapping{$institution_state}}, $institution_name);
     }
 
@@ -362 +362 @@
 
     # Write the states.dm macrofile
-    &write_state_browser_macrofile("states", \%institution_state_to_name_mapping, \%institution_name_to_id_mapping);
+    &write_state_browser_macrofile("states", \%institution_state_to_names_mapping, \%institution_name_to_id_mapping);
 }
 
@@ -890 +890 @@
     print BROWSER_MACROFILE "_cicstaticbrowser_ {\n";
 
-    my %letter_to_name_mapping;
+    my %letter_to_names_mapping;
     foreach my $name (keys %$name_to_id_mapping) {
     my ($letter) = ($name =~ /([A-Za-z0-9])/);
-    push(@{$letter_to_name_mapping{$letter}}, $name);
+    push(@{$letter_to_names_mapping{$letter}}, $name);
     }
 
     print BROWSER_MACROFILE "<center><b>";
     foreach my $letter (split(//, "ABCDEFGHIJKLMNOPQRSTUVWXYZ")) {
-    if (defined($letter_to_name_mapping{$letter})) {
+    if (defined($letter_to_names_mapping{$letter})) {
         print BROWSER_MACROFILE "<a href=\"#$letter\">$letter</a>&nbsp;";
     }
@@ -908 +908 @@
 
     print BROWSER_MACROFILE "<table cellpadding=\"0\" cellspacing=\"0\" width=\"_pagewidth_\">\n";
-
-    foreach my $letter (sort(keys %letter_to_name_mapping)) {
-    my @letter_names = sort(@{$letter_to_name_mapping{$letter}});
+    foreach my $letter (sort(keys %letter_to_names_mapping)) {
+    my @letter_names = sort(@{$letter_to_names_mapping{$letter}});
     &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";
 }
@@ -971 +970 @@
 
     foreach my $category (keys(%{$category_to_names_mapping})) {
-    # print STDERR "Category: $category\n";
-
     my $static_browser_package_name = $static_browser_package_root . $category;
     $static_browser_package_name =~ s/\W//g;
@@ -990 +987 @@
 {
     my $static_browser_package_name = shift(@_);
-    my $state_to_name_mapping = shift(@_);
+    my $state_to_names_mapping = shift(@_);
     my $name_to_id_mapping = shift(@_);
 
@@ -999 +996 @@
     print BROWSER_MACROFILE "_cicstaticbrowser_ {\n";
 
-    print BROWSER_MACROFILE "<center><b>";
-    foreach my $letter (split(//, "ABCDEFGHIJKLMNOPQRSTUVWXYZ")) {
-    # if ($letter !~ /[BEJQXYZ]/) {
-    print BROWSER_MACROFILE "<a href=\"#$letter\">$letter</a>&nbsp;";
-    # }
-    # else {
-    # print BROWSER_MACROFILE "<span style=\"color: #999999\">$letter</span>&nbsp;";
-    # }
-    }
-    print BROWSER_MACROFILE "</b></center>\n";
-
     print BROWSER_MACROFILE "<table cellpadding=\"0\" cellspacing=\"0\" width=\"_pagewidth_\">\n";
-
-    my $current_letter = "";
-    my $current_position = 0;
-    foreach my $state (sort(keys %$state_to_name_mapping)) {
-    if ($current_position > 0) {
-        while ($current_position > 0) {
-        print BROWSER_MACROFILE "<td></td>";
-        $current_position--;
-        }
-        print BROWSER_MACROFILE "</tr>\n";
-    }
-
-    print BROWSER_MACROFILE "<tr><td width=\"33%\"><br />";
-    $state =~ /^(.)/;
-    if ($1 ne $current_letter) {
-        print BROWSER_MACROFILE "<a name=\"$1\"/>";
-        $current_letter = $1;
-    }
-    print BROWSER_MACROFILE "<span style=\"color: black;\"><b>$state</b></span></td><td style=\"padding-left: 3px; padding-right: 3px;\" width=\"34%\"></td><td width=\"33%\"></td></tr>\n";
-
-    foreach my $name (sort(@{$state_to_name_mapping->{$state}})) {
-        my $id = $name_to_id_mapping->{$name};
-
-        if ($current_position == 0) {
-        print BROWSER_MACROFILE "<tr>";
-        }
-        print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&d=$id\">$name</a></td>";
-        $current_position++;
-        if ($current_position == 3) {
-        print BROWSER_MACROFILE "</tr>\n";
-        $current_position = 0;
-        }
-    }
-    }
+    foreach my $state (sort(keys(%{$state_to_names_mapping}))) {
+    my @state_names = sort(@{$state_to_names_mapping->{$state}});
+    &write_static_browser_macros_chunk($state, \@state_names, $name_to_id_mapping, undef);
+    }
+    print BROWSER_MACROFILE "</table>\n";
 
     print BROWSER_MACROFILE "}\n";