Changeset 16191

Timestamp:

2008-06-25T18:07:49+12:00 (15 years ago)

Author:

ak19

Message:

Added a cmd and corresponding operations for retrieving the greenstone library url (without domain portion)

Location:

greenstone3/trunk/web/WEB-INF/cgi

Files:

• gliserver.pl (modified) (4 diffs)
• gsdlCGI.pm (modified) (5 diffs)

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

@@ -69 +69 @@
     $gsdl_cgi->delete("cmd");
 
-    # The check-installation and greenstone-server-version commands have no arguments
+    # The check-installation, greenstone-server-version and get-library-url commands have no arguments
     if ($cmd eq "check-installation") {
     &check_installation($gsdl_cgi);
@@ -76 +76 @@
     elsif ($cmd eq "greenstone-server-version") {
     &greenstone_server_version($gsdl_cgi);
+    return;
+    }
+    elsif ($cmd eq "get-library-url-suffix") {
+    &get_library_url_suffix($gsdl_cgi);
     return;
     }
@@ -1176 +1180 @@
 }
 
-
-# gsdl_cgi must have been created for this method to work
 sub greenstone_server_version
 {   
@@ -1185 +1187 @@
 }
 
+sub get_library_url_suffix
+{
+    my $gsdl_cgi = shift(@_);
+    my $library_url = $gsdl_cgi->library_url_suffix();
+    $gsdl_cgi->generate_ok_message("Greenstone library URL suffix is: $library_url\n");
+}
 
 &main();

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

@@ -205 +205 @@
 sub get_config_info {
     my $self = shift @_;
-    my ($infotype) = @_;
+    my ($infotype, $ignore) = @_;
 
     my $site_filename = $self->{'site_filename'};
@@ -221 +221 @@
 
     if ((!defined $loc) || ($loc =~ m/^\s*$/)) {
-    $self->generate_error("$infotype is not set in $site_filename");
+    if((!defined $ignore) || (!$ignore)) {
+        $self->generate_error("$infotype is not set in $site_filename");
+    }
     }
 
@@ -308 +310 @@
 }
 
+sub get_library_url_suffix {
+    my $self = shift @_;
+    
+    if (defined $self->{'library_url_suffix'}) {
+    return $self->{'library_url_suffix'};
+    }
+
+    my $ignore = 1; # ignore absence of gwcgi if not found
+    my $library_url = $self->get_config_info("gwcgi", $ignore);
+    if(defined $library_url) {
+    $library_url =~ s/(\/|\\)$//; # remove trailing slash
+    }
+    else {
+
+    if($self->{'greenstone_version'} == 2) {
+        $library_url = $self->get_config_info("httpprefix");
+        $library_url = "$library_url/cgi-bin/library";
+    } 
+    else { # greenstone 3 or later and gwcgi not defined
+        $library_url = "/greenstone3/library";
+    }
+    }
+        
+    return $library_url;
+}
+
 sub setup_gsdl {
     my $self = shift @_;
@@ -313 +341 @@
     my $gsdlhome = $self->get_gsdl_home();
     my $gsdlos = $self->get_gsdl_os();
+    my $library_url = $self->get_library_url_suffix();
 
     $ENV{'GSDLHOME'} = $gsdlhome;
     $ENV{'GSDLOS'} = $gsdlos;
+    $self->{'library_url_suffix'} = $library_url;
     
     if($self->{'greenstone_version'} == 3) {
@@ -346 +376 @@
     my $self = shift @_;
     return $self->{'greenstone_version'};
+}
+
+sub library_url_suffix {
+    my $self = shift @_;
+    return $self->{'library_url_suffix'};
 }