Changeset 15946

Timestamp:

2008-06-09T19:09:32+12:00 (16 years ago)

Author:

ak19

Message:

parameter site retrieved by subroutine file_exists

File:

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

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

@@ -550 +550 @@
 sub file_exists
 {
-    my ($gsdl_cgi) = @_;
+    my ($gsdl_cgi, $site) = @_;
 
     my $collection = $gsdl_cgi->clean_param("c");
@@ -564 +564 @@
     # 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);
-    }
+    #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);
+    #}
+    my $collection_directory = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect", $collection);
     $gsdl_cgi->checked_chdir($collection_directory);