Changeset 31515 for main/trunk/greenstone2/perllib
- Timestamp:
- 2017-03-14T19:30:00+13:00 (7 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/servercontrol.pm
r31514 r31515 459 459 460 460 #my $output = qx/ant get-default-servlet-url/; # backtick operator, to get STDOUT (else 2>&1) 461 # see http://stackoverflow.com/questions/799968/whats-the-difference-between-perls-backticks-system-and-exec461 # - see http://stackoverflow.com/questions/799968/whats-the-difference-between-perls-backticks-system-and-exec 462 462 463 463 # 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 466 466 # to run the activate.pl script in the first place 467 my $perl_command = "ant -buildfile \"$ENV{'GSDL3SRCHOME'}/build.xml\" get-default-servlet-url"; 467 468 my $full_build_xml = &FileUtils::javaFilenameConcatenate($ENV{'GSDL3SRCHOME'},"build.xml"); 469 my $perl_command = "ant -buildfile \"$full_build_xml\" get-default-servlet-url"; 468 470 469 471 if (open(PIN, "$perl_command |")) { -
main/trunk/greenstone2/perllib/util.pm
r31514 r31515 1244 1244 # Read in the entire contents of the file in one hit 1245 1245 if (!open (FIN, $llssite_cfg)) { 1246 print STDERR "util::get_ library_URL() failed to open $llssite_cfg ($!)\n";1246 print STDERR "util::get_full_greenstone_url_prefix() failed to open $llssite_cfg ($!)\n"; 1247 1247 return undef; 1248 1248 } … … 1284 1284 #print STDERR "@@@@@ host: $host\n"; 1285 1285 if($url =~ m/https?:\/\/$host(\/)?$/) { 1286 #if($url !~ m/http :\/\/$host:$portnumber(\/)?/ || $url =~ m/http:\/\/$host(\/)?$/) {1286 #if($url !~ m/https?:\/\/$host:$portnumber(\/)?/ || $url =~ m/https?:\/\/$host(\/)?$/) { 1287 1287 # (if the URL does not contain the portnumber, OR if the port is implicitly 80 and) 1288 1288 # If the domain with http:// prefix is completely the same as the URL, assume server.exe … … 1329 1329 close(PIN); 1330 1330 } else { 1331 print STDERR "util::get_ library_URL() failed to run $perl_command to work out library URL for $gs_mode\n";1331 print STDERR "util::get_full_greenstone_url_prefix() failed to run $perl_command to work out library URL for $gs_mode\n"; 1332 1332 } 1333 1333 }
Note:
See TracChangeset
for help on using the changeset viewer.