Changeset 16415

Timestamp:

2008-07-15T16:35:38+12:00 (15 years ago)

Author:

ak19

Message:

Introduced GSDL3HOME variable for the case where a GS3server is remote

Location:

greenstone3/trunk/web/WEB-INF/cgi

Files:

• gliserver.pl (modified) (1 diff)
• gsdlCGI.pm (modified) (4 diffs)

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

@@ -369 +369 @@
     # Show the values of some important environment variables
     $installation_status .= "\n";
-    $installation_status .= "GSDL3SRCHOME: " . $ENV{'GSDL3SRCHOME'} . "\n" unless ($gsdl_cgi->greenstone_version() == 2);
+    if($gsdl_cgi->greenstone_version() != 2) {
+    $installation_status .= "GSDL3SRCHOME: " . $ENV{'GSDL3SRCHOME'} . "\n";
+    $installation_status .= "GSDL3HOME: " . $ENV{'GSDL3HOME'} . "\n";
+    }
     $installation_status .= "GSDLHOME: " . $ENV{'GSDLHOME'} . "\n";
     $installation_status .= "GSDLOS: " . $ENV{'GSDLOS'} . "\n";

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

@@ -260 +260 @@
 
     return $gsdlhome;
+}
+
+sub get_gsdl3_home {
+    my $self = shift @_;
+    my ($optional) = @_;
+    
+    if (defined $self->{'gsdl3home'}) {
+    return $self->{'gsdl3home'};
+    }
+
+    my $gsdl3home = $self->get_config_info("gsdl3home", $optional);
+
+    if(defined $gsdl3home) {
+    $gsdl3home =~ s/(\/|\\)$//; # remove trailing slash
+    $self->{'gsdl3home'} = $gsdl3home;
+    }
+    return $gsdl3home;
 }
 
@@ -387 +404 @@
 sub setup_gsdl {
     my $self = shift @_;
+    my $optional = 1; # ignore absence of specified properties in gsdl(3)site.cfg if not found
 
     my $gsdlhome = $self->get_gsdl_home();
@@ -395 +413 @@
     my $library_url = $self->get_library_url_suffix(); # best to have GSDLOS set beforehand
     $self->{'library_url_suffix'} = $library_url;
-    
+
+    require "$gsdlhome/perllib/util.pm";
+
     if($self->{'greenstone_version'} == 3) {
     my $gsdl3srchome = $self->get_gsdl3_src_home();
-    $ENV{'GSDL3SRCHOME'} = $gsdl3srchome;   
+    $ENV{'GSDL3SRCHOME'} = $gsdl3srchome;
+
+    my $gsdl3home = $self->get_gsdl3_home($optional);
+    # if a specific location for GS3's web folder is not provided,
+    # assume the GS3 web folder is in the default location
+    if(!defined $gsdl3home) { 
+        $gsdl3home = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web");
+        $self->{'gsdl3home'} = $gsdl3home;
+    } 
+    $ENV{'GSDL3HOME'} = $gsdl3home;
     } 
-
-    require "$gsdlhome/perllib/util.pm";
+   
     
     my $gsdl_bin_script = &util::filename_cat($gsdlhome,"bin","script");
@@ -428 +456 @@
     # 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);