Changeset 27522 for main

Timestamp:

2013-05-30T21:15:49+12:00 (11 years ago)

Author:

ak19

Message:

Correcting some minor bugs during build.

Location:

main/trunk/greenstone2

Files:

• bin/script/wvware.pl (modified) (1 diff)
• perllib/plugouts/GreenstoneXMLPlugout.pm (modified) (3 diffs)

main/trunk/greenstone2/bin/script/wvware.pl

@@ -40 +40 @@
 use strict;
 use util;
-use FileUtil;
+use FileUtils;
 
 # Are we running on WinNT or Win2000 (or later)?

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

@@ -65 +65 @@
 
     my $outhandler;
+    my $output_file;
     if ($self->{'debug'}) {
     $outhandler = STDOUT;
@@ -86 +87 @@
     $self->process_metafiles_metadata ($doc_obj);
 
-    my $output_file = &FileUtils::filenameConcatenate($working_dir, "doc.xml");
+    $output_file = &FileUtils::filenameConcatenate($working_dir, "doc.xml");
 
     $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
@@ -110 +111 @@
     }
     else {
-        &FileUtils::closeFileHandle($output_file, \$outhandler);
+        &FileUtils::closeFileHandle($output_file, \$outhandler) if defined $output_file;
     }