Changeset 12433

Timestamp:

2006-08-11T13:54:05+12:00 (18 years ago)

Author:

mdewsnip

Message:

Tidied up the place references, and put each reference in a <p> tag with class "cicreference", so they can be easily formatted.

File:

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

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

@@ -799 +799 @@
     my $place_narrative = $place_narrative_sql_handle->fetchrow();
     if (defined($place_narrative)) {
-        $place_narrative = &rtf_to_html($place_narrative);
-        $place_narrative =~ s/<br \/>(\s|\n)*$//;  # Remove any trailing <br /> tags
-        &new_metadata_entry($place_doc_obj, "Narrative", $place_narrative);
+        my $place_narrative_html = &rtf_to_html($place_narrative);
+        $place_narrative_html =~ s/<br \/>(\s|\n)*$//;  # Remove any trailing <br /> tags
+        &new_metadata_entry($place_doc_obj, "PlaceNarrativeHTML", $place_narrative_html);
     }
 
@@ -981 +981 @@
 
     # Convert the place references from RTF to HTML
-    my $place_references_html_string = &rtf_to_html($place_references_rtf_string);
-    if ($place_references_html_string =~ / (http|www\.)/) {
+    my $place_references_html_raw = &rtf_to_html($place_references_rtf_string);
+    if ($place_references_html_raw =~ / (http|www\.)/) {
     print STDERR "<ProcessingError n='Place $place_id' p='CICPlug' r='Warning: Found possible web address in references without hyperlink tag.'>\n" if ($self->{'gli'});
     print STDERR "Warning: Place $place_id -- Found possible web address in references without hyperlink tag.\n";
     print $fail_log_handle "Warning: Place $place_id -- Found possible web address in references without hyperlink tag.\n";
     }
-    &new_metadata_entry($place_doc_obj, "PlaceReferences", $place_references_html_string);
 
     # Split the references and try to parse title and author
-    $place_references_html_string =~ s/(\r|\n)//g;
-    my @place_references = split(/<br \/><br \/>/, $place_references_html_string);
+    my $place_references_html = "";
+    $place_references_html_raw =~ s/(\r|\n)//g;
+    my @place_references = split(/<br \/><br \/>/, $place_references_html_raw);
     foreach my $place_reference (@place_references) {
+    $place_reference =~ s/^(<br \/>\s*)*//;
     $place_reference =~ s/(<br \/>\s*)*$//;
     next if ($place_reference !~ /\w/);
     &new_metadata_entry($place_doc_obj, "Reference", $place_reference);
+    $place_references_html .= "<p class=\"cicreference\">" . $place_reference . "</p>\n";
 
     # Case 0: A magic word in the first sentence
@@ -1020 +1022 @@
     }
     }
+
+    &new_metadata_entry($place_doc_obj, "PlaceReferencesHTML", $place_references_html);
 }