Changeset 15605 for gsdl/trunk/perllib/g2futil.pm

Timestamp:

2008-05-20T18:44:14+12:00 (16 years ago)

Author:

ak19

Message:

Corrected some discrepancies so that it now works on Windows: the setting of ENV(PATH) at the top and edits to write_gsdl_xml_file

File:

• gsdl/trunk/perllib/g2futil.pm (modified) (7 diffs)

gsdl/trunk/perllib/g2futil.pm

@@ -5 +5 @@
 {
     if (!defined $ENV{'FEDORA_HOME'}) {
-    print STDERR "ERROR: Environment variable FEDORA_HOME not set.\n";
+    print STDERR "Error: Environment variable FEDORA_HOME not set.\n";
     exit 1;
     }
@@ -11 +11 @@
     my $fedora_home = $ENV{'FEDORA_HOME'};
     my $fedora_client_bin = &util::filename_cat($fedora_home,"client","bin");
-    $ENV{'PATH'} .= ":$fedora_client_bin";
+    if($ENV{'GSDLOS'} =~ m/^windows/) {
+    $ENV{'PATH'} .= ";$fedora_client_bin";
+    } else {
+    $ENV{'PATH'} .= ":$fedora_client_bin";
+    }
 }
 
@@ -60 +64 @@
     }
  
-
     my $cmd = "$prog $arguments";
 
-###    print "*** cmd = $cmd\n";
+    print "*** cmd = $cmd\n";
 
     if (open(CMD,"$cmd 2>&1 |"))
@@ -237 +240 @@
 sub write_gsdl_xml_file
 {
-    my ($fedora_host, $collect_dir) = @_;
-    
+    my ($fedora_host, $collect_dir, $options) = @_;
+    my $verbosity = $options->{'verbosity'};
+
     print STDERR "Ensuring that a correct gsdl.xml file exists on the Fedora server end\n";
     # The top of this file has already made sure that FEDORA_HOME is set
@@ -264 +268 @@
     my $collectParentDir = $collect_dir;
     $collectParentDir =~ s/collect(\/|\\)?//;
+    
+    #replace \ in path as occurs on Windows with /?
+    #$collectParentDir =~ s/\\/\//g;
     #print STDERR "**** collect's parent dir is: $collectParentDir\n";
 
@@ -294 +301 @@
     # 4. If we're here, the contents of gsdl.xml need to be updated:
     # a. First stop the fedora server
-    my $stop_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "shutdown.sh");
+    my $script_ext = ($ENV{'GSDLOS'} =~ m/^windows/) ? ".bat" : ".sh";
+    my $stop_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "shutdown".$script_ext);
     # execute the command 
     $!=0; # does this initialise the return value?
-    if (system($stop_tomcat)!=0) { # to get the actual exit value, divide by 256, but not useful here
+    my $status = system($stop_tomcat);
+    if ($status!=0) { # to get the actual exit value, divide by 256, but not useful here
     # possible tomcat was already stopped - it's not the end of the world
     print STDERR "**** Failed to stop Fedora server. Perhaps it was not running. $!\n";
+    print "Exit status = ", $status/256, "\n";
     }
 
@@ -311 +321 @@
 
     # c. Restart the fedora server
-    my $start_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "startup.sh");
+    my $start_tomcat = &util::filename_cat($fedora_home, "tomcat", "bin", "startup".$script_ext);
     $!=0;
-    if (system($start_tomcat)!=0) { 
+    $status = system($start_tomcat);
+    if ($status!=0) { 
     print STDERR "Failed to restart the Fedora server... ERROR: $!\n";
-    }
+    print "Exit status = ", $status/256, "\n";
+    }
+   
+    
     # QUESTION:
     # Starting up the Fedora server takes a long time. How long should we wait before