Changeset 31518 for main/trunk/greenstone2/perllib

Timestamp:

2017-03-14T20:10:07+13:00 (7 years ago)

Author:

ak19

Message:

Found servercontrol::get_library_url() largely duplicated in util.pm as get_fullgreenstone_url_prefix(). Merging the two functions. Tested that solr-jdbm-demo collection still rebuilds (with and without tomcat running, and with and without port change between sessions).

Location:

main/trunk/greenstone2/perllib

Files:

• servercontrol.pm (modified) (1 diff)
• util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -365 +365 @@
 
 sub get_library_URL {
+    my $self = shift(@_);
+    
+    # For web servers that are external to a Greenstone installation, 
+    # the user can pass in their web server's library URL.
+    if($self->{'library_url'}) {
+    return $self->{'library_url'};
+    }
+    
+    # For web servers included with GS (like tomcat for GS3 and server.exe 
+    # and apache for GS2), we work out the library URL:
+    my ($gs_mode, $lib_name); # gs_mode can be gs3 or gs2, lib_name is the custom servlet name
+    $gs_mode = $self->{'gs_mode'};
+    $lib_name = $self->{'library_name'};
+    
+    # If we get here, we are dealing with a server included with GS.
+    # For GS3, we ask ant for the library URL.
+    # For GS2, we derive the URL from the llssite.cfg file.
+
+    my $url = &util::get_full_greenstone_url_prefix($gs_mode, $lib_name); # found largely identical method copied
+            # into util. Don't want duplicates, so calling that from here.
+    
+    # either the url is still undef or it is now set
+    #print STDERR "\n@@@@@ final URL:|$url|\n" if $url;     
+    #print STDERR "\n@@@@@ URL still undef\n" if !$url;
+    
+    if (defined $url) {
+        $self->{'library_url'} = $url;
+    }
+
+    return $url;
+}
+
+sub OLD_get_library_URL {
     my $self = shift(@_);    
     

main/trunk/greenstone2/perllib/util.pm

@@ -1227 +1227 @@
 sub get_full_greenstone_url_prefix
 {   
+    my ($gs_mode, $lib_name) = @_;
+    
     # if already set on a previous occasion, just return that
     # (Don't want to keep repeating this: cost of re-opening and scanning files.)
     return $ENV{'FULL_GREENSTONE_URL_PREFIX'} if($ENV{'FULL_GREENSTONE_URL_PREFIX'});
 
-    my $gs_mode = ($ENV{'GSDL3SRCHOME'}) ? "gs3" : "gs2";
+    # set gs_mode if it was not passed in (servercontrol.pm would pass it in, any other callers won't)
+    $gs_mode = ($ENV{'GSDL3SRCHOME'}) ? "gs3" : "gs2" unless defined $gs_mode;
     
     my $url = undef;    
@@ -1328 +1331 @@
         }
         close(PIN);
+        
+        if (defined $lib_name) { # url won't be undef now
+            # replace the servlet_name portion of the url found, with the given library_name
+            $url =~ s@/[^/]*$@/$lib_name@;
+        }
     } else {
         print STDERR "util::get_full_greenstone_url_prefix() failed to run $perl_command to work out library URL for $gs_mode\n";