Changeset 15715

Timestamp:

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

Author:

mdewsnip

Message:

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

File:

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

gsdl/trunk/perllib/mgppbuilder.pm

@@ -27 +27 @@
 
 use basebuilder;
-use classify;
-use cfgread;
 use colcfg;
 use plugin;
+use strict; no strict 'refs';
 use util;
-use FileHandle;
+
 
 sub BEGIN {
@@ -231 +230 @@
     my ($handle);
     if ($self->{'debug'}) {
-    $handle = STDOUT;
-    } else {
+    $handle = *STDOUT;
+    }
+    else {
     if (!-e "$mgpp_passes_exe" || 
-        !open (PIPEOUT, "| mgpp_passes$exe  -M $maxnumeric $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra")) {
+        !open($handle, "| mgpp_passes$exe  -M $maxnumeric $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra")) {
         print STDERR "<FatalError name='NoRunMGPasses'>\n</Stage>\n" if $self->{'gli'};
         die "mgppbuilder::compress_text - couldn't run $mgpp_passes_exe\n";
     }
-    $handle = mgppbuilder::PIPEOUT;
     }
     
@@ -256 +255 @@
            "", {}, $self->{'buildproc'}, $self->{'maxdocs'}, 0, $self->{'gli'});
     &plugin::end($self->{'pluginfo'});
-    close (PIPEOUT);
 
     close ($handle) unless $self->{'debug'};
@@ -487 +485 @@
     my ($handle);
     if ($self->{'debug'}) {
-    $handle = STDOUT;
-    } else {
+    $handle = *STDOUT;
+    }
+    else {
     if (!-e "$mgpp_passes_exe" || 
-        !open (PIPEOUT, "| mgpp_passes$exe -M $maxnumeric $mgpp_passes_sections -f \"$fullindexprefix\" -I1 $osextra")) {
+        !open($handle, "| mgpp_passes$exe -M $maxnumeric $mgpp_passes_sections -f \"$fullindexprefix\" -I1 $osextra")) {
         print STDERR "<FatalError name='NoRunMGPasses'/>\n</Stage>\n" if $self->{'gli'};
         die "mgppbuilder::build_index - couldn't run $mgpp_passes_exe\n";
     }
-    $handle = mgppbuilder::PIPEOUT;
     }