Changeset 22820

Timestamp:

2010-08-31T14:21:37+12:00 (14 years ago)

Author:

davidb

Message:

Need to call 'set_output_handle()' in additional places, to insure the more explict marking of the output stream to be ':utf8' is enforced

Location:

main/trunk/greenstone2/perllib

Files:

• mgbuilder.pm (modified) (2 diffs)
• mgppbuilder.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/mgbuilder.pm

@@ -213 +213 @@
     }
 
+    $self->{'buildproc'}->set_output_handle ($handle);
     $self->{'buildproc'}->reset();
+
     # compress the text
     print $outhandle "\n    compressing the text\n"  if ($self->{'verbosity'} >= 1);
@@ -457 +459 @@
     print $outhandle "\n    inverting the text\n"  if ($self->{'verbosity'} >= 1);
     print STDERR "<Phase name='InvertingText'/>\n" if $self->{'gli'};
+
+    $self->{'buildproc'}->set_output_handle ($handle);
     $self->{'buildproc'}->reset();
+
     &plugin::read ($self->{'pluginfo'}, $self->{'source_dir'}, 
            "", {}, {}, $self->{'buildproc'}, $self->{'maxdocs'},0, $self->{'gli'});

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -261 +261 @@
     }
 
+    $self->{'buildproc'}->set_output_handle ($handle);
     $self->{'buildproc'}->reset();
+
     # compress the text
     print $outhandle "\n    compressing the text (mgpp_passes -T2)\n"  if ($self->{'verbosity'} >= 1);
@@ -485 +487 @@
     
     $self->{'buildproc'}->reset();
+
     &plugin::read ($self->{'pluginfo'}, $self->{'source_dir'}, 
            "", {}, {}, $self->{'buildproc'}, $self->{'maxdocs'}, 0, $self->{'gli'});
@@ -519 +522 @@
     print $outhandle "\n    inverting the text (mgpp_passes -I2)\n"  if ($self->{'verbosity'} >= 1);
     print STDERR "<Phase name='InvertingText'/>\n" if $self->{'gli'};
+
+    $self->{'buildproc'}->set_output_handle ($handle);
     $self->{'buildproc'}->reset();
+
     &plugin::read ($self->{'pluginfo'}, $self->{'source_dir'}, 
            "", {}, {}, $self->{'buildproc'}, $self->{'maxdocs'}, 0, $self->{'gli'});