Changeset 28174 for main/trunk/greenstone2

Timestamp:

2013-08-28T17:45:54+12:00 (11 years ago)

Author:

ak19

Message:

Fix to when using GSDLCOLLECTDIR

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1218 +1218 @@
         return &FileUtils::filenameConcatenate($collect_dir,$colgroup, $collection);
     }
-    elsif (defined($ENV{'GSDLCOLLECTDIR'})) {
-        return $ENV{'GSDLCOLLECTDIR'};
+    elsif (defined($ENV{'GSDLCOLLECTDIR'})) { # does GS3 ever have GSDLCOLLECTDIR defined? Is it the parent of sites?
+        if (defined $site) {
+        return &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$colgroup, $collection); # assume GSDLCOLLECTDIR is the "collect" folder?
+        #return &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},"sites",$site,"collect",$colgroup, $collection);
+        }
+        else {
+        return &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$colgroup, $collection);
+        }
     }
     else {