Changeset 12325

Timestamp:

2006-07-28T12:32:15+12:00 (18 years ago)

Author:

kjdon

Message:

now passes maxnumeric option to mgpp_passes

File:

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

trunk/gsdl/perllib/mgppbuilder.pm

@@ -172 +172 @@
     my $outhandle = $self->{'outhandle'};
 
+    my $maxnumeric = 4;
+    if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
+    $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
+    $maxnumeric = $self->{'collect_cfg'}->{'maxnumeric'};
+    }
+    
     &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));
 
@@ -212 +218 @@
     #print $outhandle "trying to run (compress 1) mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra\n";
     if (!-e "$mgpp_passes_exe" || 
-        !open (PIPEOUT, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra")) {
+        !open (PIPEOUT, "| 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";
@@ -262 +268 @@
         #print $outhandle "trying to run (compress 2) mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T2 $osextra\n";
         if (!-e "$mgpp_passes_exe" || 
-        !open ($handle, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T2 $osextra")) {
+        !open ($handle, "| mgpp_passes$exe  -M $maxnumeric $mgpp_passes_sections -f \"$fulltextprefix\" -T2 $osextra")) {
         print STDERR "<FatalError name='NoRunMGPasses'/>\n</Stage>\n" if $self->{'gli'};
         die "mgppbuilder::compress_text - couldn't run $mgpp_passes_exe\n";
@@ -421 +427 @@
     &util::filename_cat ($exedir, "mgpp_stem_idx$exe");
 
-     my $osextra = "";
+    my $maxnumeric = 4;
+    if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
+    $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
+    $maxnumeric = $self->{'collect_cfg'}->{'maxnumeric'};
+    }
+
+    my $osextra = "";
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {
     $fullindexprefix =~ s@/@\\@g;
@@ -477 +489 @@
     } else {
     if (!-e "$mgpp_passes_exe" || 
-        !open (PIPEOUT, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fullindexprefix\" -I1 $osextra")) {
+        !open (PIPEOUT, "| 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";
@@ -526 +538 @@
 
     if (!-e "$mgpp_passes_exe" || 
-        !open ($handle, "| mgpp_passes$exe $mgpp_passes_sections -f \"$fullindexprefix\" -I2 $osextra")) {
+        !open ($handle, "| mgpp_passes$exe -M $maxnumeric $mgpp_passes_sections -f \"$fullindexprefix\" -I2 $osextra")) {
         print STDERR "<FatalError name='NoRunMGPasses'/>\n</Stage>\n" if $self->{'gli'};
         die "mgppbuilder::build_index - couldn't run $mgpp_passes_exe\n";