Changeset 15564

Timestamp:

2008-05-19T12:07:11+12:00 (16 years ago)

Author:

ak19

Message:

2 changes to make this up-to-date with GS2's gliserver.pl: 1. added file-exists command and matching routine file_exists; 2. modified run_script to also deal with replace_srcdoc_with_html.pl and to escape any spaces in filenames

File:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver4gs3.pl (modified) (4 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gliserver4gs3.pl

@@ -118 +118 @@
     while (1) { }
     }
+    elsif ($cmd eq "file-exists") { 
+    &file_exists($gsdl_cgi);
+    }   
     else {
     $gsdl_cgi->generate_error("Unrecognised command: '$cmd'");
@@ -542 +545 @@
 }
 
+# Method that will check if the given file exists
+# No error message: all messages generated are OK messages
+# This method will simply state whether the file exists or does not exist.
+sub file_exists
+{
+    my ($gsdl_cgi, $username, $timestamp) = @_;
+
+    my ($gsdl_cgi) = @_;
+
+    my $collection = $gsdl_cgi->clean_param("c");
+    if ((!defined $collection) || ($collection =~ m/^\s*$/)) {
+    $gsdl_cgi->generate_error("No collection specified.");
+    }
+    my $file = $gsdl_cgi->clean_param("file");
+    if ((!defined $file) || ($file =~ m/^\s*$/)) {
+    $gsdl_cgi->generate_error("No file specified.");
+    }
+    $file =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
+   
+    # Not necessary: checking whether the user is authenticated to query existance of the file
+    #&authenticate_user($gsdl_cgi, $username, $collection);
+
+    my $gsdlhome = $ENV{'GSDLHOME'};
+    my $collection_directory = &util::filename_cat($gsdlhome, "collect", $collection);
+    $gsdl_cgi->checked_chdir($collection_directory);
+
+    # Check that the collection file exists
+    if (-e $file) {
+    $gsdl_cgi->generate_ok_message("File $file exists.");
+    } else {
+    $gsdl_cgi->generate_ok_message("File $file does not exist.");
+    }
+}
 
 sub download_collection_file
@@ -862 +898 @@
     &lock_collection($gsdl_cgi, $username, $collection, $site) unless ($script eq "mkcol.pl");
 
-    # Last argument is the collection name, except for explode_metadata_database.pl
+    # Last argument is the collection name, except for explode_metadata_database.pl and
+    # replace_srcdoc_with_html (where there's a "file" option followed by the filename. These two preceed the collection name)
     my $perl_args = $collection;
-    if ($script eq "explode_metadata_database.pl") {
-    # Last argument is the file to be exploded
+    if ($script eq "explode_metadata_database.pl" || $script eq "replace_srcdoc_with_html.pl") {
+    # Last argument is the file to be exploded or it is the file to be replaced with its html version
     my $file = $gsdl_cgi->clean_param("file");
     if ((!defined $file) || ($file =~ m/^\s*$/)) {
@@ -871 +908 @@
     }
     $gsdl_cgi->delete("file");
+    $file =~ s/ /\\ /g; # escape all spaces in filename with a backslash, i.e. "\ ".
     $perl_args = $file;
     }