Changeset 15712

Timestamp:

2008-05-27T12:47:29+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added "use strict", and fixed up various problems it found.

File:

• gsdl/trunk/perllib/lucenebuilder.pm (modified) (6 diffs)

gsdl/trunk/perllib/lucenebuilder.pm

@@ -42 +42 @@
 
 use mgppbuilder;
-
-# use IncrementalBuildUtils;
+use strict; no strict 'refs';
+
 
 sub BEGIN {
@@ -139 +139 @@
     if ($self->{'debug'})
     {
-    $handle = STDOUT;
+    $handle = *STDOUT;
     }
     else
@@ -149 +149 @@
         print STDERR "Cmd:           $full_lucene_passes_exe text $lucene_passes_sections \"$build_dir\" \"dummy\"   $osextra\n";
     if (!-e "$full_lucene_passes" ||
-        !open (PIPEOUT, "| $full_lucene_passes_exe text $lucene_passes_sections \"$build_dir\" \"dummy\"   $osextra"))
+        !open($handle, "| $full_lucene_passes_exe text $lucene_passes_sections \"$build_dir\" \"dummy\"   $osextra"))
     {
         print STDERR "<FatalError name='NoRunLucenePasses'/>\n</Stage>\n" if $self->{'gli'};
         die "lucenebuilder::build_index - couldn't run $full_lucene_passes_exe\n";
     }
-    $handle = lucenebuilder::PIPEOUT;
     }
 
@@ -177 +176 @@
     &plugin::end($self->{'pluginfo'});
     close ($handle) unless $self->{'debug'};
-    close PIPEOUT;
     $self->print_stats();
 
@@ -200 +198 @@
 
     # build each of the indexes
-    foreach $index (@$indexes) {
+    foreach my $index (@$indexes) {
     if ($self->want_built($index)) {
 
@@ -308 +306 @@
 
     if ($self->{'debug'}) {
-    $handle = STDOUT;
+    $handle = *STDOUT;
     } else {
     print STDERR "Cmd: $full_lucene_passes_exe $opt_create_index index $lucene_passes_sections \"$build_dir\" \"$indexdir\"   $osextra\n";
     if (!-e "$full_lucene_passes" ||
-        !open (PIPEOUT, "| $full_lucene_passes_exe $opt_create_index index $lucene_passes_sections \"$build_dir\" \"$indexdir\"   $osextra")) {
+        !open($handle, "| $full_lucene_passes_exe $opt_create_index index $lucene_passes_sections \"$build_dir\" \"$indexdir\"   $osextra")) {
         print STDERR "<FatalError name='NoRunLucenePasses'/>\n</Stage>\n" if $self->{'gli'};
-        die "lucenebuilder::build_index - couldn't run $lucene_passes_exe\n";
-    }
-    $handle = lucenebuilder::PIPEOUT;
+        die "lucenebuilder::build_index - couldn't run $full_lucene_passes_exe\n";
+    }
     }