Changeset 31515 for main/trunk/greenstone2/perllib/servercontrol.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/servercontrol.pm (modified) (2 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 |")) {