Changeset 31515 for main/trunk/greenstone2/perllib/util.pm

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

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (3 diffs)

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";
     }
     }