Changeset 28250 for main/trunk/greenstone2/perllib/downloaders/MediaWikiDownload.pm

Timestamp:

2013-09-10T15:37:45+12:00 (11 years ago)

Author:

ak19

Message:

1. Jenny and I fixed an oversight in OAIDownload, thanks to Kathy's suggestion, where an html page's contents used to be inspected for file types specified to be downloaded with GetDocument ONLY if the file extension was htm(l). Now the test is whether the header specifies Content-Type text/html. 2. Deprecated utils functions replaced with their FileUtils equivalents.

File:

• main/trunk/greenstone2/perllib/downloaders/MediaWikiDownload.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/downloaders/MediaWikiDownload.pm

@@ -128 +128 @@
     # check css files for HTML pages are downloaded as well
     $self->{'url'} =~ /http:\/\/([^\/]*)\//;        
-    my $base_url = &util::filename_cat($hashGeneralOptions->{"cache_dir"}, $1);    
+    my $base_url = &FileUtils::filenameConcatenate($hashGeneralOptions->{"cache_dir"}, $1);    
     &check_file($base_url, $self);