Changeset 15170 for gsdl/trunk

Timestamp:

2008-04-02T18:23:41+13:00 (16 years ago)

Author:

ak19

Message:

2 changes: 1. added file-exists command and matching routine file_exists; 2. modified

Location:

gsdl/trunk/cgi-bin

Files:

• gliserver.pl (modified) (6 diffs)
• gsdlsite.cfg (modified) (2 diffs)

gsdl/trunk/cgi-bin/gliserver.pl

@@ +1 @@
+#!/usr/bin/perl -w
 #!perl -w
 # Need to specify the full path of Perl above
@@ -36 +37 @@
 my $mail_smtp_server = "smtp.server";  # Set this appropriately
 
-
 sub main
 {
@@ -121 +121 @@
     elsif ($cmd eq "upload-collection-file") {
     &upload_collection_file($gsdl_cgi, $username, $timestamp);
-    }
+    } 
+    elsif ($cmd eq "file-exists") { 
+    &file_exists($gsdl_cgi);
+    }   
     else {
     $gsdl_cgi->generate_error("Unrecognised command: '$cmd'");
     }
 }
-
 
 sub authenticate_user
@@ -511 +513 @@
 }
 
+# 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
@@ -746 +781 @@
     &lock_collection($gsdl_cgi, $username, $collection) 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") {
+    if ($script eq "explode_metadata_database.pl" || $script eq "replace_srcdoc_with_html.pl") {
     # Last argument is the file to be exploded
     my $file = $gsdl_cgi->clean_param("file");
@@ -755 +791 @@
     }
     $gsdl_cgi->delete("file");
-    $perl_args = $file;
+    $file =~ s/ /\\ /g; # escape all spaces in filename with a backslash, i.e. "\ "
+    $perl_args = $file; 
     }
 

gsdl/trunk/cgi-bin/gsdlsite.cfg

@@ -4 +4 @@
 
 # points to the GSDLHOME directory
-gsdlhome    **GSDLHOME**
+gsdlhome     "/research/ak19/Greenstone2SVN/gsdl"
 
 # this is the http address of GSDLHOME
 # if your webservers DocumentRoot is set to $GSDLHOME
 # then httpprefix can remain commented out
-#httpprefix  /gsdl
+httpprefix  /gsdlsvn
 
 # this is the http address of the directory which
@@ -15 +15 @@
 # if your webservers DocumentRoot is set to $GSDLHOME
 # then httpimg will be /images
-httpimg     /images
+httpimg     /gsdlsvn/images
 
 # should contain the http address of this cgi script. This