Changeset 15716

Timestamp:

2008-05-27T13:03:59+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added "use strict" and fixed various problems that it found.

File:

• gsdl/trunk/perllib/mgbuilder.pm (modified) (4 diffs)

gsdl/trunk/perllib/mgbuilder.pm

@@ -27 +27 @@
 
 use basebuilder;
-use classify;
-use cfgread;
-use colcfg;
 use plugin;
+use strict; no strict 'refs';
 use util;
-use FileHandle;
+
 
 BEGIN {
@@ -149 +147 @@
     my ($handle);
     if ($self->{'debug'}) {
-    $handle = STDOUT;
-    } else {
+    $handle = *STDOUT;
+    }
+    else {
     if (!-e "$mg_passes_exe" || 
-        !open (PIPEOUT, "| mg_passes$exe -f \"$fulltextprefix\" -b $maxdocsize -T1 -M $maxnumeric $osextra")) {
+        !open($handle, "| mg_passes$exe -f \"$fulltextprefix\" -b $maxdocsize -T1 -M $maxnumeric $osextra")) {
         print STDERR "<FatalError name='NoRunMGPasses'>\n</Stage>\n" if $self->{'gli'};
         die "mgbuilder::compress_text - couldn't run $mg_passes_exe\n";
     }
-    $handle = mgbuilder::PIPEOUT;
     }
 
@@ -398 +396 @@
     my ($handle);
     if ($self->{'debug'}) {
-    $handle = STDOUT;
-    } else {
+    $handle = *STDOUT;
+    }
+    else {
     if (!-e "$mg_passes_exe" || 
-        !open (PIPEOUT, "| mg_passes$exe -f \"$fullindexprefix\" -b $maxdocsize " .
+        !open($handle, "| mg_passes$exe -f \"$fullindexprefix\" -b $maxdocsize " .
            "-$index_level -m 32 -s 0 -G -t 10 -N1 -M $maxnumeric $osextra")) {
         print STDERR "<FatalError name='NoRunMGPasses'/>\n</Stage>\n" if $self->{'gli'};
         die "mgbuilder::build_index - couldn't run $mg_passes_exe\n";
     }
-    $handle = mgbuilder::PIPEOUT;
     }
     
@@ -530 +528 @@
     my $input_file = &util::filename_cat ("text", $collect_tail);
     if (!-e "$mgstat_exe" || !open (PIPEIN, "mgstat$exe -d \"$self->{'build_dir'}\" -f \"$input_file\" |")) {
+    my $outhandle = $self->{'outhandle'};
     print $outhandle "Warning: Couldn't open pipe to $mgstat_exe to get additional stats\n";
     } else {