Changeset 850

Timestamp:

2000-01-13T14:57:57+13:00 (24 years ago)

Author:

sjboddie

Message:

added use strict - tidied a few things up etc.

File:

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

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -46 +46 @@
     @ISA = ('BasPlug');
 }
+
+use strict;
 
 sub print_usage {
@@ -72 +74 @@
 sub new {
     my $class = shift (@_);
-    $self = new BasPlug ();
+    my $self = new BasPlug ();
 
     if (!parsargv::parse(\@_, 
@@ -132 +134 @@
     }
 
-    $self->add_external_metadata ($metadata, $doc_obj, $cursection);
+    $self->extra_metadata ($doc_obj, $cursection, $metadata);
     $self->extract_metadata (\$text, $metadata, $doc_obj, $cursection) 
     unless $self->{'no_metadata'};
@@ -204 +206 @@
     my ($href, $hash_part, $rl) = $self->format_link ($link, $base_dir, $file);
 
-    if (($rl == 0) || ($href =~ /$self->{'process_exp'}/) || 
+    my ($filename) = $href =~ /^(?:.*?):(?:\/\/)?(.*)/;
+    if (($rl == 0) || ($filename =~ /$self->{'process_exp'}/) || 
     ($href =~ /\/$/) || ($href =~ /^(mailto|news|gopher|nntp|telnet|javascript):/i)) {
     $link = $href . $hash_part;
@@ -245 +248 @@
     $hash_part = "" if !defined $hash_part;
     if (!defined $before_hash || $before_hash !~ /[\w\.\/]/) {
-    print STDERR "HTMLPlug: ERROR - badly formatted tag ignored ($front$link$back)\n"
+    print STDERR "HTMLPlug: ERROR - badly formatted tag ignored ($link)\n"
         if $self->{'verbosity'};
     return ($link, "", 0);
@@ -307 +310 @@
 }
 
-# Add metadata that has been provided externally (i.e. by 
-# a previous (recursive) plugin
-sub add_external_metadata {
-    my $self = shift (@_);
-    my ($metadata, $doc_obj, $section) = @_;
-
-    foreach $field (keys(%$metadata)) {
-    # $metadata->{$field} may be an array reference
-    if (ref ($metadata->{$field}) eq "ARRAY") {
-        map { 
-        $doc_obj->add_metadata ($section, $field, $_); 
-        } @{$metadata->{$field}};
-    } else {
-        $doc_obj->add_metadata ($section, $field, $metadata->{$field}); 
-    }
-    }
-}
-
 sub extract_metadata {
     my $self = shift (@_);
     my ($textref, $metadata, $doc_obj, $section) = @_;
 
-    foreach $field (split /,/, $self->{'metadata_fields'}) {
+    foreach my $field (split /,/, $self->{'metadata_fields'}) {
     
     # don't need to extract field if it was passed in from a previous 
@@ -385 +370 @@
 
     my @eval_dirs = ();
-    foreach $d (@dirsep) {
+    foreach my $d (@dirsep) {
     if ($d eq "..") {
         pop(@eval_dirs);