Changeset 31515

Timestamp:

2017-03-14T19:30:00+13:00 (7 years ago)

Author:

ak19

Message:

Trying to bring near-identical functions servercontrol::get_library_url and util::get_full_greenstone_url_prefix() up to speed with each other before attempting to merge them in a hopefully upcoming commit

Location:

main/trunk/greenstone2/perllib

Files:

• servercontrol.pm (modified) (2 diffs)
• util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -459 +459 @@
     
     #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
+    # - 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
@@ -465 +465 @@
     # 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 $perl_command = "ant -buildfile \"$ENV{'GSDL3SRCHOME'}/build.xml\" get-default-servlet-url";
+    
+    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 |")) {

main/trunk/greenstone2/perllib/util.pm

@@ -1244 +1244 @@
         # Read in the entire contents of the file in one hit
         if (!open (FIN, $llssite_cfg)) {
-        print STDERR "util::get_library_URL() failed to open $llssite_cfg ($!)\n";
+        print STDERR "util::get_full_greenstone_url_prefix() failed to open $llssite_cfg ($!)\n";
         return undef;
         }
@@ -1284 +1284 @@
         #print STDERR "@@@@@ host: $host\n";
         if($url =~ m/https?:\/\/$host(\/)?$/) {
-            #if($url !~ m/http:\/\/$host:$portnumber(\/)?/ || $url =~ m/http:\/\/$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
@@ -1329 +1329 @@
         close(PIN);
     } else {
-        print STDERR "util::get_library_URL() failed to run $perl_command to work out library URL for $gs_mode\n";
+        print STDERR "util::get_full_greenstone_url_prefix() failed to run $perl_command to work out library URL for $gs_mode\n";
     }
     }