Changeset 25796 for main/trunk/greenstone2

Timestamp:

2012-06-18T16:49:05+12:00 (12 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:

• bin/script/activate.pl (modified) (1 diff)
• perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/activate.pl

@@ -418 +418 @@
     my $qualified_collection = pop @argv; # qualified collection
         
-    my $collect_dir = "collect"; # undef
+    my $collect_dir = undef; #"collect"; # can't be "collect" when only -site is provided for GS3
     my $build_dir = undef;
     my $index_dir = undef;

main/trunk/greenstone2/perllib/util.pm

@@ -1836 +1836 @@
         return &util::filename_cat($collect_dir,$colgroup, $collection);
     }
+    elsif (defined($ENV{'GSDLCOLLECTDIR'})) {
+        return $ENV{'GSDLCOLLECTDIR'};
+    }
     else {
         if (defined $site) {