Changeset 27394 for main/trunk

Timestamp:

2013-05-23T13:01:25+12:00 (11 years ago)

Author:

jmt12

Message:

Replaced hardcoded -e (which should have been a -d anyway) with FileUtils::directoryExists() call and replaced hardcoded pregs to remove extra and trailing slashes in path with call to FileUtils::sanitizePath() (which does the same thing, but in a way that is aware of protocol prefixes)

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -241 +241 @@
     # fill in the default import and archives directories if none
     # were supplied, turn all \ into / and remove trailing /
-    $importdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "import") if $importdir eq "";
-    # @todo &FileUtils::sanitizePath($importdir) [jmt12]
-    $importdir =~ s/[\\\/]+/\//g;
-    $importdir =~ s/\/$//;
-    if (!-e $importdir) {
-    &gsprintf($out, "{import.no_import_dir}\n\n", $importdir);
-    die "\n";
+    if ($importdir eq "")
+    {
+      $importdir = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, "import");
+    }
+    else
+    {
+      # Don't do this - it kills protocol prefixes
+      #$importdir =~ s/[\\\/]+/\//g;
+      #$importdir =~ s/\/$//;
+      # Do this instead
+      &FileUtils::sanitizePath($importdir);
+    }
+    if (!&FileUtils::directoryExists($importdir))
+    {
+      &gsprintf($out, "{import.no_import_dir}\n\n", $importdir);
+      die "\n";
     }
     $self->{'importdir'} = $importdir;