Changeset 14553

Timestamp:

2007-09-21T09:12:12+12:00 (17 years ago)

Author:

shaoqun

Message:

fixed wellformed tags;don't do converting character entities to their utf-8 as perl already takes care of it; make the image anchors work

File:

• gsdl/trunk/perllib/plugins/HTMLPlug.pm (modified) (5 diffs)

gsdl/trunk/perllib/plugins/HTMLPlug.pm

@@ -172 +172 @@
     }
 
-    if ($self->{'input_encoding'} eq "iso_8859_1") {
+   if ($self->{'input_encoding'} eq "iso_8859_1") {
     # convert to utf-8
     $$text=&unicode::unicode2utf8(&unicode::convert2unicode("iso_8859_1", $text));
@@ -178 +178 @@
     # convert any alphanumeric character entities to their utf-8
     # equivalent for indexing purposes
-    &ghtml::convertcharentities ($$text);
+    #&ghtml::convertcharentities ($$text);
 
     $$text =~ s/\s+/ /g; # remove \n's
@@ -213 +213 @@
     # fix up the image links
     $section =~ s/<img[^>]*?src=\"?([^\">]+)\"?[^>]*>/
-    <center><img src=\"$1\"><\/center><br>/ig;
+    <center><img src=\"$1\" \/><\/center><br/>/ig;
     $section =~ s/&lt;&lt;I&gt;&gt;\s*([^\.]+\.(png|jpg|gif))/
-    <center><img src=\"$1\"><\/center><br>/ig;
+    <center><img src=\"$1\" \/><\/center><br\/>/ig;
 
     return $section;
@@ -390 +390 @@
         if ($self->{'old_style_HDL'})
         {
-        $hdl_output_filename = &util::filename_cat($tmp_dirname, "newHDL_$tailname$suffix");
+        $hdl_output_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
         $hdl_output_filename = $self->convert_to_newHDLformat($input_filename,$hdl_output_filename);
         }
@@ -947 +947 @@
 
     my $anchor_name = $img_file;
-    $anchor_name =~ s/^.*\///;
-    $anchor_name = "<a name=\"$anchor_name\" />";
-
-    return $front . $img_file . $back . $anchor_name;
+    #$anchor_name =~ s/^.*\///;
+    #$anchor_name = "<a name=\"$anchor_name\" ></a>";
+
+    my $image_link = $front . $img_file .$back;
+    my $anchor_link = "<a href=\"$img_file\" >".$image_link."</a>";  
+
+    return $anchor_link;    
+    #return $front . $img_file . $back . $anchor_name;
 }