Changeset 9143

Timestamp:

2005-02-23T10:08:05+13:00 (19 years ago)

Author:

davidb

Message:

Added handling of <embed> tag in a similar fashion to <img>

Also, problem found in handling of URLs extracted in <a>, <img> etc.
tags. Lost leading /. Now fixed.

File:

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

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -182 +182 @@
     my @usemap_matches = ($$textref =~ m/<img[^>]*?usemap\s*=\s*($attval)[^>]*>/igs);
     my @link_matches = ($$textref =~ m/<link[^>]*?href\s*=\s*($attval)[^>]*>/igs);
-   
-
-    foreach my $link (@img_matches, @usemap_matches, @link_matches) {
+    my @embed_matches = ($$textref =~ m/<embed[^>]*?src\s*=\s*($attval)[^>]*>/igs);
+
+    foreach my $link (@img_matches, @usemap_matches, @link_matches, @embed_matches) {
 
     # remove quotes from link at start and end if necessary
@@ -194 +194 @@
     $link =~ s/\#.*$//s; # remove any anchor names, e.g. foo.html#name becomes foo.html
 
-    if ($link !~ s@^/@@ && $link !~ /^([A-Z]:?)\\/) {
+    if ($link !~ m@^/@ && $link !~ m/^([A-Z]:?)\\/) {
         # Turn relative file path into full path
         my $dirname = &File::Basename::dirname($filename);
@@ -200 +200 @@
     }
     $link = $self->eval_dir_dots($link);
+    
     $self->{'file_blocks'}->{$link} = 1;
     }
@@ -238 +239 @@
     my $web_url = "http://$file";
     $doc_obj->add_metadata($cursection, "URL", $web_url);
+    $doc_obj->add_metadata($cursection, "weblink", "<a href=\"$web_url\">");
+    $doc_obj->add_metadata($cursection, "webicon", "_iconworld_");
+    $doc_obj->add_metadata($cursection, "/weblink", "</a>");
 
     if ($self->{'description_tags'}) {
@@ -397 +401 @@
 
     # allow spaces if inside quotes - jrm21
-    $$textref =~ s/(<img[^>]*?src\s*=\s*)(\"[^\"]+\"|[^\s>]+)([^>]*>)/
+    $$textref =~ s/(<(?:img|embed)[^>]*?src\s*=\s*)(\"[^\"]+\"|[^\s>]+)([^>]*>)/
     $self->replace_images ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
 
@@ -430 +434 @@
 
     my ($href, $hash_part, $rl) = $self->format_link ($link, $base_dir, $file);
-   
+
     my $img_file =  $self->add_file ($href, $rl, $hash_part, $base_dir, $doc_obj, $section);
+
     my $anchor_name = $img_file;
     $anchor_name =~ s/^.*\///;
@@ -503 +508 @@
 
     my ($ext) = $filename =~ /(\.[^\.]*)$/;
+
+    if ($rl == 0) {
+    if ((!defined $ext) || ($ext !~ /$self->{'assoc_files'}/)) {
+        return "_httpextlink_&rl=0&el=prompt&href=" . $href . $hash_part;
+    }
+    else {
+        return "_httpextlink_&rl=0&el=direct&href=" . $href . $hash_part;
+    }
+    }
 
     if ((!defined $ext) || ($ext !~ /$self->{'assoc_files'}/)) {
@@ -592 +606 @@
         }
         else {
+            # before_hash has lost leading slash by this point,
+            # -> add back in prior to substitution with $base_dir
+            $before_hash = "/$before_hash"; 
+
             $before_hash = &util::filename_cat("",$before_hash);
             $before_hash =~ s@^$base_dir/@@;