Index: /gsdl/trunk/perllib/lucenebuilder.pm
===================================================================
--- /gsdl/trunk/perllib/lucenebuilder.pm (revision 15711)
+++ /gsdl/trunk/perllib/lucenebuilder.pm (revision 15712)
@@ -42,6 +42,6 @@
use mgppbuilder;
-
-# use IncrementalBuildUtils;
+use strict; no strict 'refs';
+
sub BEGIN {
@@ -139,5 +139,5 @@
if ($self->{'debug'})
{
- $handle = STDOUT;
+ $handle = *STDOUT;
}
else
@@ -149,10 +149,9 @@
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 "\n\n" if $self->{'gli'};
die "lucenebuilder::build_index - couldn't run $full_lucene_passes_exe\n";
}
- $handle = lucenebuilder::PIPEOUT;
}
@@ -177,5 +176,4 @@
&plugin::end($self->{'pluginfo'});
close ($handle) unless $self->{'debug'};
- close PIPEOUT;
$self->print_stats();
@@ -200,5 +198,5 @@
# build each of the indexes
- foreach $index (@$indexes) {
+ foreach my $index (@$indexes) {
if ($self->want_built($index)) {
@@ -308,13 +306,12 @@
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 "\n\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";
+ }
}