Changeset 27505 for main/trunk

Timestamp:

2013-05-29T09:51:07+12:00 (11 years ago)

Author:

jmt12

Message:

Closing the RSS filehandle with the new function in FileUtils too

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (6 diffs)

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

@@ -522 +522 @@
             # only if opening new file
         my $output_dir = $self->get_output_dir();
-        &FileUtils::makeAllDirectories($output_dir) unless -e $output_dir;
+        &FileUtils::makeAllDirectories($output_dir) unless &FileUtils::directoryExists($output_dir);
         my $doc_file = &FileUtils::filenameConcatenate($output_dir, $doc_dir, "doc.xml");
         my $short_doc_file = &FileUtils::filenameConcatenate($doc_dir, "doc.xml");
@@ -675 +675 @@
     return if (!defined $output_dir);
 
-    &FileUtils::makeAllDirectories($output_dir) unless -e $output_dir;
+    &FileUtils::makeAllDirectories($output_dir) unless &FileUtils::directoryExists($output_dir);
       
     my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);
-    &FileUtils::makeAllDirectories($working_dir) unless -e $working_dir;
+    &FileUtils::makeAllDirectories($working_dir) unless &FileUtils::directoryExists($working_dir);
 
     my @assoc_files = ();
@@ -719 +719 @@
     $real_filename = &util::downgrade_if_dos_filename($real_filename);
 
-    if (-e $real_filename) {
+    if (&FileUtils::fileExists($real_filename)) {
 
         $filename = &FileUtils::filenameConcatenate($working_dir, $afile);
@@ -766 +766 @@
     my $raw_filename = &util::downgrade_if_dos_filename($real_filename);
 
-    if (-e $raw_filename) {
+    if (&FileUtils::fileExists($raw_filename)) {
 
 #       if (defined $collect_dir) {
@@ -909 +909 @@
     my ($output_file_name, $xslt_file)=@_;
 
-    return unless defined $xslt_file and $xslt_file ne "" and -e $xslt_file;
+    return unless defined $xslt_file and $xslt_file ne "" and &FileUtils::fileExists($xslt_file);
     
     my $java_class_path =  &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"bin","java","ApplyXSLT.jar");
@@ -983 +983 @@
     $doc_file .= ".gz";
     $short_doc_file .= ".gz";
-    if (!-e $doc_file) {
+    if (!&FileUtils::fileExists($doc_file)) {
          my $outhandle = $self->{'output_handle'};
         print $outhandle "error while gzipping: $doc_file doesn't exist\n";