Changeset 27517

Timestamp:

2013-05-30T14:53:20+12:00 (11 years ago)

Author:

jmt12

Message:

Noticed and replaced a couple of -e's (that should have been -d's anyway) with FileUtils::directoryExists()

File:

• main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm

@@ -68 +68 @@
     $outhandler = STDOUT;
     # can we do the xslt and still do debug mode?
-    } 
+    }
     else {
     my $output_dir = $self->get_output_dir();
-    &FileUtils::makeAllDirectories($output_dir) unless -e $output_dir;
-    
-    my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);    
-    &FileUtils::makeAllDirectories($working_dir) unless -e $working_dir;
-    
+        if (!&FileUtils::directoryExists($output_dir))
+        {
+          &FileUtils::makeAllDirectories($output_dir);
+        }
+
+    my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);
+        if (!&FileUtils::directoryExists($working_dir))
+        {
+          &FileUtils::makeAllDirectories($working_dir);
+        }
+
     $self->process_assoc_files ($doc_obj, $doc_dir, '');
-    
+
     $self->process_metafiles_metadata ($doc_obj);
 
     my $output_file = &FileUtils::filenameConcatenate($working_dir, "doc.xml");
-    
+
     $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
-    
-    
+
     if (defined $self->{'xslt_writer'}){
         $outhandler = $self->{'xslt_writer'};
@@ -92 +97 @@
     }
     }
-    
+
     binmode($outhandler,":utf8");