Changeset 16836

Timestamp:

2008-08-15T17:33:04+12:00 (16 years ago)

Author:

ak19

Message:

1. When working out the web_url, it needs to know of any containing directories. These directories may have directory dots in them. These dots are now first evaluated before creating the web_url. This is definitely necessary on Linux. 2. Minor bugfix in eval_dir_dots subroutine so that it does not do a filecat when there is no directory.

File:

• gsdl/trunk/perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -708 +708 @@
 
 #    print STDERR "#### file: $file\n";
+
     my ($tailname,$dirname,$suffix) = &File::Basename::fileparse($file, "\\.[^\\.]+\$");
     my $utf8_file = $self->filename_to_utf8_metadata($file);
-
     my $web_url = "http://";
     if(defined $dirname) { # local directory
+    $dirname = $self->eval_dir_dots($dirname);
     $web_url = $web_url.$dirname.$utf8_file; 
     } else {
@@ -1503 +1504 @@
     }
     }
-    return &util::filename_cat(@eval_dirs);
+    
+    my $evaluated_filename = (scalar @eval_dirs > 0) ? &util::filename_cat(@eval_dirs) : "";
+    return $evaluated_filename;
 }