Changeset 23768 for main/trunk/greenstone2/perllib/cgiactions/explodeaction.pm

Timestamp:

2011-03-09T15:06:32+13:00 (13 years ago)

Author:

davidb

Message:

Setting of the collect directory changed to be compliant with Greenstone 3 and its 'site' variable

File:

• main/trunk/greenstone2/perllib/cgiactions/explodeaction.pm (modified) (6 diffs)

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

@@ -32 +32 @@
 use dbutil;
 use ghtml;
+use util;
 
 use File::Basename;
@@ -95 +96 @@
     my @docids = @_;
 
+    my $collect   = $self->{'collect'};
+    my $gsdl_cgi  = $self->{'gsdl_cgi'};
     my $infodb_type = $self->{'infodbtype'};
 
     # Derive the archives dir    
-    my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives");
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
+    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
+    ##my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives");
 
     my $arcinfo_doc_filename 
@@ -138 +144 @@
 {
     my $self = shift @_;
-
     my ($import_filenames) = @_;
 
+    my $collect   = $self->{'collect'};   
+    my $gsdl_cgi  = $self->{'gsdl_cgi'};
     my $infodb_type = $self->{'infodbtype'};
 
     # Derive the archives dir    
-    my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives");
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
+    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
+    ##my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives");
 
     # Obtain the oids for the specified import filenames
@@ -154 +164 @@
 
     foreach my $if (@$import_filenames) {
+        $if = &util::upgrade_if_dos_filename($if);
+
+    print STDERR "*** looking import filename key \"$if\"\n";
 
     my $src_rec
@@ -190 +203 @@
     my ($docids) = @_;
 
+    my $collect   = $self->{'collect'};
+    my $gsdl_cgi  = $self->{'gsdl_cgi'};
     my $infodb_type = $self->{'infodbtype'};
 
     # Derive the archives and import directories
-    my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives");
-    my $import_dir  = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"import");
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
+    
+    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
+    my $import_dir  = &util::filename_cat($collect_dir,$collect,"import");
 
     # Obtain the doc.xml path for the specified docID
@@ -254 +272 @@
     }
     
-    # Obtain the collect dir
-    my $collect_dir = &util::filename_cat($gsdl_home, "collect");
+    # Derive the archives dir    
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
+    
+    my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives");
+    ##my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives");
 
     # Make sure the collection isn't locked by someone else