Changeset 12939

Timestamp:

2006-09-29T14:25:49+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed up & escaping for HTML 4 compliance, and lots of institution, place and designer page tidy ups.

File:

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

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

@@ -380 +380 @@
         my $institution_place_id = $institution_places_match_hashref->{"Entry_ID"};
         my $institution_place_name = $institution_places_match_hashref->{"Current_name"};
-        $institution_places_list_html .= "<a href=\"_gwcgi_?a=d&amp;d=p$institution_place_id\">$institution_place_name</a><br />\n";
+        $institution_places_list_html .= "<a href=\"_gwcgi_?a=d&d=p$institution_place_id\">$institution_place_name</a><br />\n";
     }
     &new_metadata_entry($institution_doc_obj, "InstitutionPlacesListHTML", $institution_places_list_html);
@@ -423 +423 @@
         my $institution_best_place_id = $institution_best_place_image_hashref->{"Entry_ID"};
         my $institution_best_place_image_medium_file_href = $self->generate_place_image_variant($institution_doc_obj, $institution_best_place_image_location, "medium");
-        &new_metadata_entry($institution_doc_obj, "InstitutionBestPlaceImageHTML", "<a href=\"_gwcgi_?a=d&amp;d=p$institution_best_place_id\"><img alt=\"$institution_best_place_image_location\" src=\"$institution_best_place_image_medium_file_href\"/><br /><span class=\"cictext\">$institution_best_place_image_name</span></a>");
+        &new_metadata_entry($institution_doc_obj, "InstitutionBestPlaceImageHTML", "<a href=\"_gwcgi_?a=d&d=p$institution_best_place_id\"><img alt=\"$institution_best_place_image_name\" src=\"$institution_best_place_image_medium_file_href\"/><br />$institution_best_place_image_name</a>");
     }
 
@@ -443 +443 @@
             $institution_campus_plan_pdf_file_name =~ s/ /%20/g;
             my $institution_campus_plan_pdf_file_href = "_httpcollection_/index/assoc/[assocfilepath]/$institution_campus_plan_pdf_file_name";
-            $institution_campus_plans_list_html .= "<a href=\"$institution_campus_plan_pdf_file_href\"><span class=\"cictext\">$institution_campus_plan_name (PDF)</span></a><br />";
+            $institution_campus_plans_list_html .= "<a href=\"$institution_campus_plan_pdf_file_href\">$institution_campus_plan_name (PDF)</a><br />";
 
             $institution_doc_obj->associate_file($institution_campus_plan_pdf_file_path, $institution_campus_plan_name . ".pdf", undef, $institution_doc_obj->get_top_section());
@@ -463 +463 @@
         $institution_doc_obj->add_utf8_metadata($institution_campus_plan_image_section, "ImagePath", $institution_campus_plan_image_large_file_href);
 
-        $institution_campus_plans_list_html .= "<a href=\"_gwcgi_?a=d&amp;d=i$institution_id.$institution_campus_plan_image_section\"><span class=\"cictext\">$institution_campus_plan_name</span></a><br />";
+        $institution_campus_plans_list_html .= "<a href=\"_gwcgi_?a=d&d=i$institution_id.$institution_campus_plan_image_section\">$institution_campus_plan_name</a><br />";
         }
     }
@@ -685 +685 @@
             $designer_name_to_id_mapping{$designer_name} = $designer_id;
         }
-        $place_construction_architect_links .= "<a href=\"_gwcgi_?a=d&amp;d=d$designer_id\">$designer_name</a> ";
+        $place_construction_architect_links .= "<a href=\"_gwcgi_?a=d&d=d$designer_id\">$designer_name</a> ";
         push(@{$designer_name_to_place_ids_mapping{$designer_name}}, $place_id);
         }
 
         my $place_construction_date_prefix = $place_construction_dates_match_hashref->{"Prefix"} || "";
-        $place_construction_dates_table_html .= "<tr><td valign=\"top\"><nobr>$place_construction_date_prefix $place_construction_date</nobr>&nbsp;</td><td valign=\"top\">$place_construction_note $place_construction_architect_links</td></tr>";
+        $place_construction_dates_table_html .= "<tr><td class=\"cicplaceconstructiondatetd\" valign=\"top\">$place_construction_date_prefix $place_construction_date</td><td valign=\"top\">$place_construction_note $place_construction_architect_links</td></tr>";
     }
     &new_metadata_entry($place_doc_obj, "PlaceConstructionDatesTableHTML", "<table cellpadding=\"0\" cellspacing=\"0\">" . $place_construction_dates_table_html . "</table>");
@@ -734 +734 @@
         }
         my $place_year_prefix = $place_functions_match_hashref->{"Prefix"} || "";
-        $place_functions_table_html .= "<tr><td valign=\"top\"><nobr>$place_year_prefix $place_year</nobr>&nbsp;</td><td valign=\"top\">$place_function</td></tr>";
+        $place_functions_table_html .= "<tr><td class=\"cicplacefunctionyeartd\" valign=\"top\">$place_year_prefix $place_year</td><td valign=\"top\">$place_function</td></tr>";
 
         # Prepare function metadata for browsing and searching
@@ -828 +828 @@
             $place_pdf_file_name =~ s/ /%20/g;
             my $place_pdf_file_href = "_httpcollection_/index/assoc/[assocfilepath]/$place_pdf_file_name";
-            $place_images_html .= "<tr><td align=\"right\" valign=\"top\"><a href=\"$place_pdf_file_href\">_iconpdf_</a></td><td valign=\"top\"><a href=\"$place_pdf_file_href\"><span class=\"cictext\">$place_image_name (PDF)</span></a></td></tr>\n";
+            $place_images_html .= "<tr><td align=\"right\" valign=\"top\"><a href=\"$place_pdf_file_href\">_iconpdf_</a></td><td valign=\"top\"><a href=\"$place_pdf_file_href\">$place_image_name (PDF)</a></td></tr>\n";
         }
         else {
@@ -848 +848 @@
             $place_doc_obj->add_utf8_metadata($place_image_section, "ImagePath", $place_image_large_file_href);
 
-            $place_images_html .= "<tr><td valign=\"top\"><a href=\"_gwcgi_?a=d&amp;d=p$place_id.$place_image_section\"><img src=\"$place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"_gwcgi_?a=d&amp;d=p$place_id.$place_image_section\"><span class=\"cictext\">$place_image_name</span></a></td></tr>\n";
+            $place_images_html .= "<tr><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$place_id.$place_image_section\"><img alt=\"$place_image_name\" src=\"$place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$place_id.$place_image_section\">$place_image_name</a></td></tr>\n";
         }
         else {
-            $place_images_html .= "<tr><td valign=\"top\"><img src=\"_httpcollection_/images/no_image-small.jpg\"/></td><td valign=\"top\"><span class=\"cictext\">&nbsp;</span></td></tr>\n";
+            $place_images_html .= "<tr><td valign=\"top\"><img alt=\"No image\" src=\"_httpcollection_/images/no_image-small.jpg\"/></td><td valign=\"top\">&nbsp;</td></tr>\n";
         }
         }
@@ -940 +940 @@
         }
 
-        $designer_places_list_html .= "<tr><td valign=\"top\"><a href=\"_gwcgi_?a=d&amp;d=p$designer_place_id\"><img src=\"$designer_place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"_gwcgi_?a=d&amp;d=p$designer_place_id\">$designer_place_name</a>, $designer_place_institution_name<br /><b>Date of construction:</b> $designer_place_construction_date_value</td></tr>\n";
+        $designer_places_list_html .= "<tr><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$designer_place_id\"><img src=\"$designer_place_image_small_file_href\"/></a></td><td valign=\"top\"><a href=\"_gwcgi_?a=d&d=p$designer_place_id\">$designer_place_name</a>, $designer_place_institution_name<br /><b>Date of construction:</b> $designer_place_construction_date_value</td></tr>\n";
     }
 
@@ -969 +969 @@
     # Anything from the database is ISO 8859-1 encoded, so convert to UTF-8
     $metadata_value = &unicode::ascii2utf8(\$metadata_value);
+
+    # Escape any '&' characters so the metadata is HTML 4 compliant when displayed
+    $metadata_value =~ s/&([^\#])/&amp;$1/g;
 
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), $metadata_name, $metadata_value);