Changeset 27158 for main/trunk/greenstone2/common-src

Timestamp:

2013-04-05T14:20:49+13:00 (11 years ago)

Author:

ak19

Message:

get_collection_dir was never returning anything, but was expected to return the collection dir. And for GS3, the web folder can be located outside GSDL3SRCHOME, in which case it will be stored in GSDL3HOME.

File:

• main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm (modified) (1 diff)

main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

@@ -682 +682 @@
     }
     }
-    elsif($self->{'greenstone_version'} == 3 && defined $ENV{'GSDL3SRCHOME'}) {
-    if(defined $collection) {
-        $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect", $collection);
-    } else {
-        $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect");
-    }
-    }
+    elsif($self->{'greenstone_version'} == 3) {
+    if(defined $ENV{'GSDL3HOME'}) {
+        if(defined $collection) {
+        $collection_directory = &util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect", $collection);
+        } else {
+        $collection_directory = &util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect");
+        }
+    }
+    elsif(defined $ENV{'GSDL3SRCHOME'}) {
+        if(defined $collection) {
+        $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect", $collection);
+        } else {
+        $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect");
+        }
+    }
+    }
+    return $collection_directory;
 }