Changeset 28175 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2013-08-28T18:01:35+12:00 (11 years ago)

Author:

ak19

Message:

Splitting resolve_collection_dir into two functions, one of which resolves and gets the collect_dir, since I wish to reuse the latter

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -1215 +1215 @@
     my ($colgroup, $collection) = &util::get_collection_parts($qualified_collection);   
     
-    if (defined $collect_dir && $collect_dir) { # ensure not empty string either
-        return &FileUtils::filenameConcatenate($collect_dir,$colgroup, $collection);
-    }
-    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 {
-        if (defined $site) {
-            return &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'},"sites",$site,"collect",$colgroup, $collection);
-        }
-        else {
-            return &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"collect",$colgroup, $collection);
-        }
-    }
+    if (!defined $collect_dir || !$collect_dir) { # if undefined or empty string
+        $collect_dir = &util::get_working_collect_dir($site);
+    }
+
+    return &FileUtils::filenameConcatenate($collect_dir,$colgroup,$collection);
+}
+
+# work out the full path to "collect" of this greenstone 2/3 installation
+sub get_working_collect_dir {
+    my ($site) = @_;
+    
+    if (defined $ENV{'GSDLCOLLECTDIR'}) { # a predefined collect dir exists
+    return $ENV{'GSDLCOLLECTDIR'};
+    }
+    
+    elsif (defined $site && $site) { # site non-empty, so get default collect dir for GS3
+    if defined $ENV{'GSDL3HOME'} {
+        return &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'},"sites",$site,"collect");
+    } else {
+        return &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites",$site,"collect");
+    }
+    }
+    
+    else { # get default collect dir for GS2
+    return &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"collect");
+    }
 }