Changeset 22689

Timestamp:

2010-08-19T15:57:02+12:00 (14 years ago)

Author:

mdewsnip

Message:

Trac ticket #634: change so "​ftp://" is used instead of "​http://" in URLs when importing mirrored content where the domain name contains "ftp". By Richard Managh at DL Consulting Ltd.

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

@@ -370 +370 @@
     my $web_url = "http://";
     if(defined $dirname) { # local directory
+        # Check for "ftp" in the domain name of the directory
+        #  structure to determine if this URL should be a ftp:// URL
+        # This check is not infallible, but better than omitting the
+        #  check, which would cause all files downloaded from ftp sites
+        #  via mirroring with wget to have potentially erroneous http:// URLs
+        #  assigned in their metadata
+        if ($dirname =~ /^[^\/]*ftp/i)
+    {
+      $web_url = "ftp://";
+    }
     $dirname = $self->eval_dir_dots($dirname);
     $dirname .= &util::get_dirsep() if $dirname ne ""; # if there's a directory, it should end on "/"