Changeset 13152 for trunk/cic-hcap

Timestamp:

2006-10-20T12:54:58+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now removes extra less-than and greater-than characters, and catches another case where web addresses aren't correctly marked as hyperlinks.

File:

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

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

@@ -882 +882 @@
     # Convert the place references from RTF to HTML
     my $place_references_html_raw = &rtf_to_html($place_references_rtf_string);
-    if ($place_references_html_raw =~ / (http|www\.)/) {
+    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";
@@ -1104 +1104 @@
     }
 
+    # Remove extra less-than and greater-than symbols
+    $rtf_string =~ s/< </</g;
+    $rtf_string =~ s/<(<+)/</g;
+    $rtf_string =~ s/> >/>/g;
+    $rtf_string =~ s/>(>+)/>/g;
+
     # Remove empty tags for HTML 4 compliance
     $rtf_string =~ s/<i>\s*<\/i>/ /g;