Changeset 25796

Show
Ignore:
Timestamp:
18.06.2012 16:49:05 (7 years ago)
Author:
ak19
Message:

1. Bugfix: the collect_dir should not be initialised to collect but undef. The problem was noticed when only the site flag is provided for GS3 and the collectdir option was not set, and the fallback value of collect ended up being used and things went wrong. 2. The ENV GSDLCOLLECTDIR may be set, so if it is, the sub resolve_collection_dir should use that.

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/activate.pl

    r25677 r25796  
    418418    my $qualified_collection = pop @argv; # qualified collection 
    419419         
    420     my $collect_dir = "collect"; # undef 
     420    my $collect_dir = undef; #"collect"; # can't be "collect" when only -site is provided for GS3 
    421421    my $build_dir = undef; 
    422422    my $index_dir = undef; 
  • main/trunk/greenstone2/perllib/util.pm

    r25598 r25796  
    18361836        return &util::filename_cat($collect_dir,$colgroup, $collection); 
    18371837    } 
     1838    elsif (defined($ENV{'GSDLCOLLECTDIR'})) { 
     1839        return $ENV{'GSDLCOLLECTDIR'}; 
     1840    } 
    18381841    else { 
    18391842        if (defined $site) {