Changeset 965

Timestamp:

2000-02-23T09:46:16+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed bug - added assoc_files option

File:

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

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -71 +71 @@
     print STDERR "   -w3mir                 Set if w3mir was used to generate input file structure.\n";
     print STDERR "                          w3mir \n";
+    print STDERR "   -assoc_files           Perl regular expression of file extensions to associate with\n";
+    print STDERR "                          html documents. Defaults to '(?i)\.(jpe?g|gif|png|css|pdf)$'\n";
     print STDERR "   -rename_assoc_files    Renames files associated with documents (e.g. images). Also\n";
     print STDERR "                          creates much shallower directory structure (useful when creating\n";
@@ -88 +90 @@
              q^metadata_fields/.*/Title^, \$self->{'metadata_fields'},
              q^w3mir^, \$self->{'w3mir'},
+             q^assoc_files/.*/(?i)\.(jpe?g|gif|png|css|pdf)$^, \$self->{'assoc_files'},
              q^rename_assoc_files^, \$self->{'rename_assoc_files'})) {
     &print_usage();
@@ -134 +137 @@
     $/ = "\n";
     close FILE;
-    if ($text !~ /\w/) {
+    if (!defined $text || $text !~ /\w/) {
     print STDERR "HTMLPlug: ERROR: $file contains no text\n" if $self->{'verbosity'};
     return 0;
@@ -191 +194 @@
     
     my ($href, $hash_part, $rl) = $self->format_link ($link, $base_dir, $file);
-    return $front . $self->add_file ($href, $base_dir, $doc_obj, $section) . $back;
+    return $front . $self->add_file ($href, $rl, $hash_part, $base_dir, $doc_obj, $section) . $back;
 }
 
@@ -234 +237 @@
     # link is to some other type of file (image, pdf etc.) so we'll
     # need to associate that file
-    return $front . $self->add_file ($href, $base_dir, $doc_obj, $section) . $back;
+    return $front . $self->add_file ($href, $rl, $hash_part, $base_dir, $doc_obj, $section) . $back;
     }
 }
@@ -240 +243 @@
 sub add_file {
     my $self = shift (@_);
-    my ($href, $base_dir, $doc_obj, $section) = @_;
+    my ($href, $rl, $hash_part, $base_dir, $doc_obj, $section) = @_;
     my ($newname);
 
@@ -247 +250 @@
     $filename = &util::filename_cat ($base_dir, $filename);
     my ($ext) = $filename =~ /(\.[^\.]*)$/;
+
+    if ((!defined $ext) || ($ext !~ /$self->{'assoc_files'}/)) {
+    return "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part;
+    }
+
     if ($self->{'rename_assoc_files'}) {
     if (defined $self->{'aux_files'}->{$href}) {
@@ -253 +261 @@
     } else {
         $newname = $self->{'dir_num'} . "/" . $self->{'file_num'} . $ext;
+        $self->{'aux_files'}->{$href} = {'dir_num' => $self->{'dir_num'}, 'file_num' => $self->{'file_num'}};
         $self->inc_filecount ();
     }