Changeset 12941

Timestamp:

2006-09-29T15:10:00+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now removes extra <br /> tags from end of place narrative, and removes empty <i> </i> tags in HTML generated from RTF.

File:

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

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

@@ -502 +502 @@
 
     # Prepare SQL statement for getting everything from the Place table
-    my $place_sql_statement = "SELECT * FROM tblPlace";
+    my $place_sql_statement = "SELECT * FROM tblPlace";  # WHERE Entry_ID<100";
     my $place_sql_handle = $dbh->prepare($place_sql_statement);
     $place_sql_handle->{LongReadLen} = 65536;
@@ -805 +805 @@
     if (defined($place_narrative)) {
         my $place_narrative_html = &rtf_to_html($place_narrative);
-        $place_narrative_html =~ s/<br \/>(\s|\n)*$//;  # Remove any trailing <br /> tags
+        $place_narrative_html =~ s/(<br \/>(\s|\n)*)*$//;  # Remove any trailing <br /> tags
         &new_metadata_entry($place_doc_obj, "PlaceNarrativeHTML", $place_narrative_html);
     }
@@ -1073 +1073 @@
     }
 
+    # Remove empty tags for HTML 4 compliance
+    $rtf_string =~ s/<i>\s*<\/i>/ /g;
+
     return $rtf_string;
 }