Changeset 23184 for main/trunk

Timestamp:

2010-10-20T13:32:50+13:00 (14 years ago)

Author:

davidb

Message:

Updating of PATH changed to prepend (rather than append) so new environment for Greenstone found ahead of any older settting. The latter happens with the main NZDL web server that sets GSDLHOME we now have the situation that we run more than one Greenstone install from within the same Apache installation

File:

• main/trunk/greenstone2/cgi-bin/gsdlCGI.pm (modified) (2 diffs)

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

@@ -477 +477 @@
     
     my $gsdl_bin_script = &util::filename_cat($gsdlhome,"bin","script");
-    &util::envvar_append("PATH",$gsdl_bin_script);
+    &util::envvar_prepend("PATH",$gsdl_bin_script);
     
     my $gsdl_bin_os = &util::filename_cat($gsdlhome,"bin",$gsdlos);
-    &util::envvar_append("PATH",$gsdl_bin_os);
+    &util::envvar_prepend("PATH",$gsdl_bin_os);
     
     # If the "perlpath" property is set in the gsdl(3)site.cfg config file, it is
@@ -517 +517 @@
     if(defined $java_home) {
     $ENV{'JAVA_HOME'} = $java_home;
+    }
+
+    # Process any extension setup.pl files
+    my $ext_home = &util::filename_cat($gsdlhome,"ext");
+
+    if (opendir(EXTDIR,$ext_home) ) {
+    my @pot_ext_dir = grep { $_ !~ m/^\./ } readdir(EXTDIR);
+
+    closedir(EXTXDIR);
+
+    foreach my $ed (@pot_ext_dir) {
+        my $full_ext_dir = &util::filename_cat($ext_home,$ed);
+        if (-d $full_ext_dir) {
+        my $full_inc_file = &util::filename_cat($full_ext_dir,
+                            "$ed-setup.pl");
+        if (-f $full_inc_file) {
+
+            my $store_cwd = Cwd::cwd();
+
+            chdir($full_ext_dir);
+            require "./$ed-setup.pl";
+            chdir($store_cwd);
+        }
+        }
+    }
     }