Changeset 9941

Timestamp:

2005-05-24T16:37:52+12:00 (19 years ago)

Author:

davidb

Message:

Additional support added to gsdlCGI.pm. For example, hunts for java in
a few locations; gsdlhome is checked to see if it ends in a trailing slash,
and this is removed if it is. Some later stages of the code do not perform
correctly if the trailing slash is left there.

File:

• trunk/gsdl/cgi-bin/gsdlCGI.pm (modified) (3 diffs)

trunk/gsdl/cgi-bin/gsdlCGI.pm

@@ -62 +62 @@
     # ensure only alpha-numeric plus a few other special chars remain
 
-    $val =~ s/[^[:alnum:]@\.\/\- :]//g if (defined $val); 
+    $val =~ s/[^[:alnum:]@\.\/\- :_]//g if (defined $val); 
 
     return $val;
@@ -145 +145 @@
 }
 
+sub get_gsdl_home {
+    my $self = shift @_;
+
+    my $gsdlhome = $self->get_config_info("gsdlhome");
+
+    # Unix specific
+    $gsdlhome =~ s/\/$//; # remove trailing slash
+
+    return $gsdlhome;
+}
 
 
@@ -166 +176 @@
 }
 
+sub mkdir
+{
+    my $self = shift @_;
+    my ($dir) = @_;
+
+
+    # Currently, Unix specific, need to generalise to Windows etc.
+    # => hook in with util.pm ?
+
+    my $cmd = "mkdir $dir 2>&1"; # Unix specific
+
+    my $output = `$cmd`;
+
+    if ($?>0) {
+    $self->generate_error("Failed to create directory: $dir\n\n$output");
+    }
+}
+
+sub check_for_java()
+{
+    my $self = shift @_;
+
+    my $java = "java";
+
+    if (defined $ENV{'JAVA_HOME'}) {
+    my $java_home = $ENV{'JAVA_HOME'};
+    # Unix specific
+    $java_home =~ s/\/$//; # remove trailing slash if present
+    $java = "$java_home/bin/java"; # Unix specific
+    }
+    else {
+    $self->generate_error("Unable to file java");
+    }
+
+
+    return $java;
+}
+
 sub unix_cmd
 {