Changeset 16385

Timestamp:

2008-07-14T14:41:00+12:00 (15 years ago)

Author:

ak19

Message:

Processes new fedorahome and fedoraversion variables if these have been set in the gsdlsite.cfg files. Otherwise, if FEDORA_HOME env var has been set, it uses this to set either FEDORA2_HOME or FEDORA3_HOME as is needed by the Fedora import and build scripts. Additional minor (cosmetic) changes.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) (8 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm

@@ -205 +205 @@
 sub get_config_info {
     my $self = shift @_;
-    my ($infotype, $ignore) = @_;
+    my ($infotype, $optional) = @_;
 
     my $site_filename = $self->{'site_filename'};
@@ -221 +221 @@
 
     if ((!defined $loc) || ($loc =~ m/^\s*$/)) {
-    if((!defined $ignore) || (!$ignore)) {
+    if((!defined $optional) || (!$optional)) {
         $self->generate_error("$infotype is not set in $site_filename");
     }
@@ -264 +264 @@
 sub get_java_home {
     my $self = shift @_;
+    my ($optional) = @_;
     
     if (defined $self->{'javahome'}) {
@@ -269 +270 @@
     }
 
-    my $javahome = $self->get_config_info("javahome");
-
-    $javahome =~ s/(\/|\\)$//; # remove trailing slash
-
+    my $javahome = $self->get_config_info("javahome", $optional);
+    if(defined $javahome) {
+    $javahome =~ s/(\/|\\)$//; # remove trailing slash
+    $self->{'javahome'} = $javahome;
+    }
     return $javahome;
 }
@@ -285 +287 @@
     my $perlpath = $self->get_config_info("perlpath");
 
-    $perlpath =~ s/(\/|\\)$//; # remove trailing slash
-
+    if(defined $perlpath) {
+    $perlpath =~ s/(\/|\\)$//; # remove trailing slash
+    $self->{'perlpath'} = $perlpath;
+    }
     return $perlpath;
 }
@@ -317 +321 @@
     }
 
-    my $ignore = 1; # ignore absence of gwcgi if not found
-    my $library_url = $self->get_config_info("gwcgi", $ignore);
+    my $optional = 1; # ignore absence of gwcgi if not found
+    my $library_url = $self->get_config_info("gwcgi", $optional);
     if(defined $library_url) {
     $library_url =~ s/(\/|\\)$//; # remove trailing slash
@@ -337 +341 @@
     }
     }
-        
+
+    $self->{'library_url_suffix'} = $library_url;
     return $library_url;
+}
+
+sub setup_fedora_homes {
+    my $self = shift @_;
+    my ($optional) = @_;
+
+    # The following will still allow the ENV FEDORA_HOME variables to have been set outside 
+    # the gsdlsite.cfg file. Existing env vars are only overwritten if they've *also* been
+    # defined in gsdlsite.cfg.
+    if(!defined $self->{'fedora_home'} && !defined $self->{'fedora_version'}) 
+    {
+    # Can look for any fedorahome properties defined in the gsdlsite.cfg file
+    $self->{'fedora_home'} = $self->get_config_info("fedorahome", $optional);
+    $self->{'fedora_version'} = $self->get_config_info("fedoraversion", $optional);
+    
+    if(defined $self->{'fedora_home'} && defined $self->{'fedora_version'}) 
+    {
+        # need to set $ENV{FEDORA2_HOME} or $ENV{FEDORA3_HOME} *and* $ENV{FEDORA_HOME}
+        my $env_name = "FEDORA".$self->{'fedora_version'}."_HOME";
+        $ENV{$env_name} = $self->{'fedora_home'};
+        $ENV{'FEDORA_HOME'} = $self->{'fedora_home'}; 
+    } 
+
+    # if none were specified in the file, use the ENV vars if FEDORA_HOME is already set there
+    elsif(defined $ENV{'FEDORA_HOME'}) 
+    { 
+        $self->{'fedora_home'} = $ENV{'FEDORA_HOME'};
+        if(defined $ENV{'FEDORA2_HOME'} && ($ENV{'FEDORA_HOME'} eq $ENV{'FEDORA2_HOME'})) 
+        {
+        $self->{'fedora_version'} = 2;
+        } 
+        else # try defaulting to Fedora 3
+        { 
+        print STDERR "Setting FEDORA3_HOME env variable to FEDORA_HOME (".$ENV{'FEDORA_HOME'}.").\n";
+        $self->{'fedora_version'} = 3; 
+        $ENV{'FEDORA3_HOME'} = $ENV{'FEDORA_HOME'};
+        }
+    }
+    }
 }
 
@@ -374 +418 @@
     }
     }
-    
-    # Uncomment these lines if you want to read the "javahome" and "perlpath" properties 
-    # from values you have set in the gsdl(3)site.cfg config file
-    #my $javahome = $self->get_java_home(); 
-    #$ENV{'JAVA_HOME'} = $javahome;
+
+    # Uncomment these lines if you want to read the "perlpath" property from
+    # the gsdl(3)site.cfg config file into PATH
     #if(!defined $perl_bin_dir) {
     #$perl_bin_dir = $self->get_perl_path();
     #&util::envvar_append("PATH", $perl_bin_dir);
     #}
+    
+    # gsdl(3)site.cfg can specify JAVA_HOME and FEDORA_HOME along with Fedora's version. Both
+    # are needed (by scripts g2f-import and g2f-buildcol) when using Greenstone 2 with Fedora.
+    my $optional = 1; # ignore absence of these properties in gsdl(3)site.cfg if not found
+
+    if(!defined $ENV{'JAVA_HOME'}) {
+    $ENV{'JAVA_HOME'} = $self->get_java_home($optional);
+    }
+
+    $self->setup_fedora_homes($optional);
 }