Changeset 15943

Timestamp:

2008-06-09T17:56:06+12:00 (16 years ago)

Author:

ak19

Message:

GS3 needs to use site variable instead of localsite.

File:

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

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

@@ -119 +119 @@
     }
     elsif ($cmd eq "file-exists") { 
-    &file_exists($gsdl_cgi);
-    }   
+    &file_exists($gsdl_cgi, $site);
+    } 
     else {
     $gsdl_cgi->generate_error("Unrecognised command: '$cmd'");
@@ -550 +550 @@
 sub file_exists
 {
-    my ($gsdl_cgi, $username, $timestamp) = @_;
-
     my ($gsdl_cgi) = @_;
 
@@ -564 +562 @@
     $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 $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", "localsite", "collect", $collection);
+    # Not necessary to check whether the user is authenticated to query existence of the file
+    
+    my $collection_directory = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection);
+    if(defined $ENV{'GSDL3SRCHOME'}) { # GS3 case
+    $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect", $collection);
+    }
     $gsdl_cgi->checked_chdir($collection_directory);
 
@@ -577 +577 @@
     }
 }
+
 
 sub download_collection_file