Changeset 31519

Timestamp:

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

Author:

ak19

Message:

Removing duplicate function temporarily marked as OLD_functionname().

File:

• main/trunk/greenstone2/perllib/servercontrol.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -397 +397 @@
 }
 
-sub OLD_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 = undef;    
-    
-    if($gs_mode eq "gs2") {     
-    my $llssite_cfg = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "llssite.cfg");
-    
-    if(-f $llssite_cfg) {
-        # check llssite.cfg for line with url property
-        # for server.exe also need to use portnumber and enterlib properties            
-        
-        # Read in the entire contents of the file in one hit
-        if (!open (FIN, $llssite_cfg)) {
-        $self->print_msg("activate.pl::get_library_URL failed to open $llssite_cfg ($!)\n");
-        return undef;
-        }
-        
-        my $contents;
-        sysread(FIN, $contents, -s FIN);            
-        close(FIN);
-        
-        my @lines = split(/[\n\r]+/, $contents); # split on carriage-returns and/or linefeeds
-        my $enterlib = "";
-        my $portnumber = "8282"; # will remain empty (implicit port 80) unless it's specifically been assigned
-        
-        foreach my $line (@lines) {             
-        if($line =~ m/^url=(.*)$/) {
-            $url = $1;                  
-        } elsif($line =~ m/^enterlib=(.*)$/) {
-            $enterlib = $1;                 
-        } elsif($line =~ m/^portnumber=(.*)$/) {
-            $portnumber = $1;                   
-        }   
-        }
-        
-        if(!$url) {
-        return undef;
-        }
-        elsif($url eq "URL_pending") { # library is not running
-        # do not process url=URL_pending in the file, since for server.exe 
-        # this just means the Enter Library button hasn't been pressed yet              
-        $url = undef;
-        }
-        else { 
-        # In the case of server.exe, need to do extra work to get the proper URL
-        # But first, need to know whether we're indeed dealing with server.exe:
-        
-        # compare the URL's domain to the full URL
-        # E.g. for http://localhost:8383/greenstone3/cgi-bin, the domain is localhost:8383
-        my $uri = URI->new( $url );
-        my $host = $uri->host;
-        #print STDERR "@@@@@ host: $host\n";
-        if($url =~ m/https?:\/\/$host(\/)?$/) {
-            #if($url !~ m/https?:\/\/$host:$portnumber(\/)?/ || $url =~ m/https?:\/\/$host(\/)?$/) {
-            # (if the URL does not contain the portnumber, OR if the port is implicitly 80 and)                 
-            # If the domain with http:// prefix is completely the same as the URL, assume server.exe
-            # then the actual URL is the result of suffixing the port and enterlib properties in llssite.cfg
-            $url = $url.":".$portnumber.$enterlib;          
-        } # else, apache web server         
-                
-        }           
-    }
-    } elsif($gs_mode eq "gs3") {
-    # Either check build.properties for tomcat.server, tomcat.port and app.name (and default servlet name).
-    # app.name is stored in app.path by build.xml. Need to move app.name in build.properties from build.xml
-    
-    # Or, run the new target get-default-servlet-url
-    # the output can look like:
-    #
-    # Buildfile: build.xml
-    #   [echo] os.name: Windows Vista
-    #
-    # get-default-servlet-url:
-    #   [echo] http://localhost:8383/greenstone3/library
-    # BUILD SUCCESSFUL
-    # Total time: 0 seconds
-    
-    #my $output = qx/ant get-default-servlet-url/; # backtick operator, to get STDOUT (else 2>&1)
-    # - see http://stackoverflow.com/questions/799968/whats-the-difference-between-perls-backticks-system-and-exec
-    
-    # The get-default-servlet-url ant target can be run from anywhere by specifying the
-    # location of GS3's ant build.xml buildfile. Activate.pl can be run from anywhere for GS3
-    # GSDL3SRCHOME will be set for GS3 by gs3-setup.sh, a step that would have been necessary
-    # to run the activate.pl script in the first place
-    
-    my $full_build_xml = &FileUtils::javaFilenameConcatenate($ENV{'GSDL3SRCHOME'},"build.xml");
-    my $perl_command = "ant -buildfile \"$full_build_xml\" get-default-servlet-url";
-    
-    if (open(PIN, "$perl_command |")) {
-        while (defined (my $perl_output_line = <PIN>)) {
-        if($perl_output_line =~ m@(https?):\/\/(\S*)@) { # grab all the non-whitespace chars
-            $url="$1://".$2; # preserve the http protocol #$url="http://".$1;
-        }
-        }
-        close(PIN);
-        
-        if(defined $lib_name) { # url won't be undef
-            # replace the servlet_name portion of the url found, with the given library_name
-            $url =~ s@/[^/]*$@/$lib_name@;
-        }
-    } else {
-        $self->print_msg("activate.pl::get_library_URL: Failed to run $perl_command to work out library URL for $gs_mode\n");
-    }
-    }
-    
-    # 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;
-    
-    $self->{'library_url'} = $url;
-    return $url;
-}
-
-
 sub do_deactivate {
     my $self = shift(@_);