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

Timestamp:

2011-12-09T18:25:27+13:00 (12 years ago)

Author:

ak19

Message:

Third set of commits to do with the migration of cgi-bin into common-src, so that upon make install, common-src\cgi-bin will be installed in cgi-bin\GSDLOS(GSDLARCH). The first commit was of changes to files in cgi-bin itself. The second commit was moving cgi-bin. This one involves changes to all the files referring to cgi-bin where this needs to be changed to cgi-bin\OS_and_ARCH.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -1486 +1486 @@
 }
 
+sub os_dir() {
+    
+    my $gsdlarch = "";
+    if(defined $ENV{'GSDLARCH'}) {
+    $gsdlarch = $ENV{'GSDLARCH'};
+    }
+    return $ENV{'GSDLOS'}.$gsdlarch;
+}
 
 # Returns the greenstone URL prefix extracted from the appropriate GS2/GS3 config file. 
@@ -1503 +1511 @@
     } else {
     $defaultUrlprefix = "/greenstone";
-    $configfile = &util::filename_cat($ENV{'GSDLHOME'}, "cgi-bin", "gsdlsite.cfg");
+    $configfile = &util::filename_cat($ENV{'GSDLHOME'}, "cgi-bin", &os_dir(), "gsdlsite.cfg");
     push(@propertynames, (qw/\nhttpprefix/, qw/\ngwcgi/)); # inspect one property then the other 
     }