Changeset 27623

Timestamp:

2013-06-14T15:50:20+12:00 (11 years ago)

Author:

ak19

Message:

Using FileUtils::FileExists in place of minus-e for the same test.

File:

• main/trunk/greenstone2/perllib/plugin.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/plugin.pm

@@ -129 +129 @@
     my $success=0;
     foreach my $plugname (@check_list) {
-    if (-e $plugname) {
+    if (&FileUtils::fileExists($plugname)) {
         # lets add perllib folder to INC
           # check it isn't already there first [jmt12]
         my ($perllibfolder) = $plugname =~ /^(.*[\/\\]perllib)[\/\\]plugins/;
-        if (-d $perllibfolder)
+        if (&FileUtils::directoryExists($perllibfolder))
             {
               my $found_perllibfolder = 0;
@@ -285 +285 @@
     # the .kill file is a handy (if not very elegant) way of aborting 
     # an import.pl or buildcol.pl process
-    if (-e &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, ".kill")) {
+    if (&FileUtils::fileExists(&FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, ".kill"))) {
     gsprintf($outhandle, "{plugin.kill_file}\n");
     die "\n";
@@ -316 +316 @@
     # the .kill file is a handy (if not very elegant) way of aborting 
     # an import.pl or buildcol.pl process
-    if (-e &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, ".kill")) {
+    if (&FileUtils::fileExists(&FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, ".kill"))) {
     gsprintf($outhandle, "{plugin.kill_file}\n");
     die "\n";
@@ -367 +367 @@
     # the .kill file is a handy (if not very elegant) way of aborting 
     # an import.pl or buildcol.pl process
-    if (-e &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, ".kill")) {
+    if (&FileUtils::fileExists(&FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'}, ".kill"))) {
     gsprintf($outhandle, "{plugin.kill_file}\n");
     die "\n";