Changeset 12340 for trunk/gsdl/perllib


Ignore:
Timestamp:
2006-07-28T15:21:45+12:00 (18 years ago)
Author:
kjdon
Message:

maxnumeric is set using set_maxnumeric (by buildcol.pl) rather than the builder looking directly in the collect.cfg file

Location:
trunk/gsdl/perllib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/perllib/basebuilder.pm

    r12128 r12340  
    118118    }
    119119
     120    $self->{'maxnumeric'} = 4;
    120121    return $self;
    121122}
    … …  
    212213}
    213214
     215sub set_maxnumeric {
     216    my $self = shift (@_);
     217    my ($maxnumeric) = @_;
     218
     219    $self->{'maxnumeric'} = $maxnumeric;
     220}
    214221sub set_strip_html {
    215222    my $self = shift (@_);
    … …  
    427434    $build_cfg->{'notbuilt'} = \@notbuilt if scalar (@notbuilt);
    428435
    429     $build_cfg->{'maxnumeric'} = 4;
    430     if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
    431     $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
    432     $build_cfg->{'maxnumeric'} = $self->{'collect_cfg'}->{'maxnumeric'};
    433     }
     436    $build_cfg->{'maxnumeric'} = $self->{'maxnumeric'};
    434437
    435438    $self->build_cfg_extra($build_cfg);

  • trunk/gsdl/perllib/mgbuilder.pm

    r10468 r12340  
    9696    my $outhandle = $self->{'outhandle'};
    9797
    98     my $maxnumeric = 4;
    99     if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
    100     $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
    101     $maxnumeric = $self->{'collect_cfg'}->{'maxnumeric'};
    102     }
     98    my $maxnumeric = $self->{'maxnumeric'};
    10399
    104100    &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));
    … …  
    309305    &util::filename_cat ($exedir, "mg_stem_idx$exe");
    310306
    311     my $maxnumeric = 4;
    312     if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
    313     $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
    314     $maxnumeric = $self->{'collect_cfg'}->{'maxnumeric'};
    315     }
     307    my $maxnumeric = $self->{'maxnumeric'};
    316308
    317309    my $osextra = "";

  • trunk/gsdl/perllib/mgppbuilder.pm

    r12325 r12340  
    172172    my $outhandle = $self->{'outhandle'};
    173173
    174     my $maxnumeric = 4;
    175     if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
    176     $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
    177     $maxnumeric = $self->{'collect_cfg'}->{'maxnumeric'};
    178     }
     174    my $maxnumeric = $self->{'maxnumeric'};
    179175   
    180176    &util::mk_all_dir (&util::filename_cat($self->{'build_dir'}, "text"));
    … …  
    427423    &util::filename_cat ($exedir, "mgpp_stem_idx$exe");
    428424
    429     my $maxnumeric = 4;
    430     if (defined($self->{'collect_cfg'}->{'maxnumeric'}) &&
    431     $self->{'collect_cfg'}->{'maxnumeric'} =~ /^\d+$/) {
    432     $maxnumeric = $self->{'collect_cfg'}->{'maxnumeric'};
    433     }
     425    my $maxnumeric = $self->{'maxnumeric'};
    434426
    435427    my $osextra = "";
Note: See TracChangeset for help on using the changeset viewer.