Changeset 12928 for trunk/cic-hcap

Timestamp:

2006-09-29T11:05:13+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now writes a Javascript safe version of the state static browser macros, for HTML 4 compliance.

File:

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

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

@@ -1246 +1246 @@
         $anchor_name = $letter;
     }
-    &write_static_browser_macros_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
+    print BROWSER_MACROFILE &get_static_browser_macro_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
     }
     print BROWSER_MACROFILE "</table>\n";
@@ -1254 +1254 @@
 
 
-sub write_static_browser_macros_chunk
+sub get_static_browser_macro_chunk
 {
     my $chunk_title = shift(@_);
@@ -1262 +1262 @@
     my $id_to_extra_mapping = shift(@_);
 
-    print BROWSER_MACROFILE "<tr><td width=\"50%\"><br />";
+    my $static_browser_macro_chunk = "<tr><td width=\"50%\"><br />";
     if (defined($anchor_name) && $anchor_name ne "") {
-    print BROWSER_MACROFILE "<a name=\"$anchor_name\"/>";
-    }
-    print BROWSER_MACROFILE "<span style=\"color: black;\"><b>$chunk_title</b></span></td><td width=\"50%\"></td></tr>";
+    $static_browser_macro_chunk .= "<a name=\"$anchor_name\"/>";
+    }
+    $static_browser_macro_chunk .= "<span style=\"color: black;\"><b>$chunk_title</b></span></td><td width=\"50%\"></td></tr>";
 
     my %full_name_to_id_mapping;
@@ -1280 +1280 @@
     my $half_point = ((scalar(@full_names) % 2 == 0) ? scalar(@full_names) / 2 : (scalar(@full_names) + 1) / 2);
     for (my $i = 0; $i < $half_point; $i++) {
-    print BROWSER_MACROFILE "<tr>";
+    $static_browser_macro_chunk .= "<tr>";
 
     my $id = $full_name_to_id_mapping{$full_names[$i]};
     my $name = $id_to_name_mapping->{$id};
     my $extra = $id_to_extra_mapping->{$id} || "";
-    print BROWSER_MACROFILE "<td valign=\"top\"><a href=\"_gwcgi_?a=d&amp;d=$id\">" . &html_safe($name) . "</a>" . &html_safe($extra) . "</td>";
-
-    print BROWSER_MACROFILE "<td valign=\"top\">";
+    $static_browser_macro_chunk .= "<td valign=\"top\"><a href=\"_gwcgi_?a=d&amp;d=$id\">" . &html_safe($name) . "</a>" . &html_safe($extra) . "</td>";
+
+    $static_browser_macro_chunk .= "<td valign=\"top\">";
     if (defined($full_names[$i+$half_point])) {
         $id = $full_name_to_id_mapping{$full_names[$i+$half_point]};
         $name = $id_to_name_mapping->{$id};
         $extra = $id_to_extra_mapping->{$id} || "";
-        print BROWSER_MACROFILE "<a href=\"_gwcgi_?a=d&amp;d=$id\">" . &html_safe($name) . "</a>" . &html_safe($extra);
-    }
-    print BROWSER_MACROFILE "</td>";
-
-    print BROWSER_MACROFILE "</tr>";
-    }
+        $static_browser_macro_chunk .= "<a href=\"_gwcgi_?a=d&amp;d=$id\">" . &html_safe($name) . "</a>" . &html_safe($extra);
+    }
+    $static_browser_macro_chunk .= "</td>";
+
+    $static_browser_macro_chunk .= "</tr>";
+    }
+
+    return $static_browser_macro_chunk;
 }
 
@@ -1357 +1359 @@
 
     foreach my $state (sort(keys(%state_name_to_abbr_mapping))) {
-    my $state_abbr = $state_name_to_abbr_mapping{$state};
-    print BROWSER_MACROFILE "\n_cicstate" . $state_abbr . "_ {";
+    my $state_sans_spaces = $state;
+    $state_sans_spaces =~ s/ //g;
     my @state_ids = ();
     if (defined($state_to_ids_mapping->{$state})) {
         @state_ids = @{$state_to_ids_mapping->{$state}};
     }
-    my $state_sans_spaces = $state;
-    $state_sans_spaces =~ s/ //g;
-    &write_static_browser_macros_chunk($state, $state_sans_spaces, \@state_ids, $id_to_name_mapping, undef);
+    my $state_abbr = $state_name_to_abbr_mapping{$state};
+
+    my $state_static_browser_macro_chunk = &get_static_browser_macro_chunk($state, $state_sans_spaces, \@state_ids, $id_to_name_mapping, undef);
     if (!defined($state_to_ids_mapping->{$state})) {
-        print BROWSER_MACROFILE "<tr><td colspan=\"2\" valign=\"top\">No institutions for this state</td></tr>";
-    }
+        $state_static_browser_macro_chunk .= "<tr><td colspan=\"2\" valign=\"top\">No institutions for this state</td></tr>";
+    }
+
+    # Write out the normal macro chunk
+    print BROWSER_MACROFILE "\n_cicstate" . $state_abbr . "_ {";
+    print BROWSER_MACROFILE $state_static_browser_macro_chunk;
     print BROWSER_MACROFILE "}\n";
+
+    # Write out a Javascript safe version
+    print BROWSER_MACROFILE "\n_cicstate" . $state_abbr . "js_ {";
+    print BROWSER_MACROFILE &javascript_safe($state_static_browser_macro_chunk);
+    print BROWSER_MACROFILE "}\n";
     }
 
@@ -1376 +1387 @@
 
 
+sub javascript_safe
+{
+    my $text = shift(@_);
+    $text =~ s/<\//<\\\\\//g;
+    return $text;
+}
+
+
 1;