Changeset 16461 for greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl

Timestamp:

2008-07-18T15:23:16+12:00 (16 years ago)

Author:

ak19

Message:

1. FEDORA_VERSION has become the secondary environment variable when running FLI. It has replaced FEDORA2_HOME/FEDORA3_HOME. 2. When FEDORA_HOME is set but not FEDORA_VERSION, it will default to FEDORA_VERSION being 3. This is done here order to keep it in sync with running FLI locally with the fli.bat/fli.sh scripts.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) (1 diff)

greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl

@@ -377 +377 @@
     $installation_status .= "JAVA_HOME: " . $ENV{'JAVA_HOME'} . "\n" if defined($ENV{'JAVA_HOME'}); # on GS2, Java's only on the PATH
     $installation_status .= "PATH: " . $ENV{'PATH'} . "\n";
-    $installation_status .= "FEDORA_HOME: ".$ENV{'FEDORA_HOME'} if defined($ENV{'FEDORA_HOME'});
+    if(defined $ENV{'FEDORA_VERSION'}) { # not using FLI unless version set
+    $installation_status .= "FEDORA_HOME: ".$ENV{'FEDORA_HOME'} . "\n";
+    $installation_status .= "FEDORA_VERSION: ".$ENV{'FEDORA_VERSION'};
+    }
     
-    if (defined $ENV{'FEDORA2_HOME'}) {
-    $installation_status .= "\nFEDORA2_HOME: ".$ENV{'FEDORA2_HOME'}."\n";
-    } elsif (defined $ENV{'FEDORA3_HOME'}) {
-    $installation_status .= "\nFEDORA3_HOME: ".$ENV{'FEDORA3_HOME'}."\n";
-    }
-
     if ($installation_ok) { ## M. Dewsnip's svn log comment stated that for iis6_mode output needs to go to STDOUT
     if($iis6_mode && $gsdl_cgi->greenstone_version() == 2) {