Changeset 27159

Timestamp:

2013-04-05T14:35:37+13:00 (11 years ago)

Author:

ak19

Message:

Fixing how the collection_directory which gets locked upon a call to lock_collection gets determined. The code was considering only the GS2 case.

File:

• main/trunk/greenstone2/perllib/cgiactions/baseaction.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

@@ -345 +345 @@
     }
 
-    my $gsdlhome = $ENV{'GSDLHOME'};
-    my $collection_directory = &util::filename_cat($gsdlhome, "collect", $collection);
+    #my $gsdlhome = $ENV{'GSDLHOME'};
+    #my $collection_directory = &util::filename_cat($gsdlhome, "collect", $collection);
+    my $site = $self->{'site'};
+    my $collection_directory = $gsdl_cgi->get_collection_dir($site, $collection);
     $gsdl_cgi->checked_chdir($collection_directory);