Changeset 23768 for main/trunk/greenstone2
- Timestamp:
- 2011-03-09T15:06:32+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/cgiactions/explodeaction.pm
r23742 r23768 32 32 use dbutil; 33 33 use ghtml; 34 use util; 34 35 35 36 use File::Basename; … … 95 96 my @docids = @_; 96 97 98 my $collect = $self->{'collect'}; 99 my $gsdl_cgi = $self->{'gsdl_cgi'}; 97 100 my $infodb_type = $self->{'infodbtype'}; 98 101 99 102 # Derive the archives dir 100 my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives"); 103 my $site = $self->{'site'}; 104 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 105 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 106 ##my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives"); 101 107 102 108 my $arcinfo_doc_filename … … 138 144 { 139 145 my $self = shift @_; 140 141 146 my ($import_filenames) = @_; 142 147 148 my $collect = $self->{'collect'}; 149 my $gsdl_cgi = $self->{'gsdl_cgi'}; 143 150 my $infodb_type = $self->{'infodbtype'}; 144 151 145 152 # Derive the archives dir 146 my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives"); 153 my $site = $self->{'site'}; 154 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 155 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 156 ##my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives"); 147 157 148 158 # Obtain the oids for the specified import filenames … … 154 164 155 165 foreach my $if (@$import_filenames) { 166 $if = &util::upgrade_if_dos_filename($if); 167 168 print STDERR "*** looking import filename key \"$if\"\n"; 156 169 157 170 my $src_rec … … 190 203 my ($docids) = @_; 191 204 205 my $collect = $self->{'collect'}; 206 my $gsdl_cgi = $self->{'gsdl_cgi'}; 192 207 my $infodb_type = $self->{'infodbtype'}; 193 208 194 209 # Derive the archives and import directories 195 my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives"); 196 my $import_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"import"); 210 my $site = $self->{'site'}; 211 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 212 213 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 214 my $import_dir = &util::filename_cat($collect_dir,$collect,"import"); 197 215 198 216 # Obtain the doc.xml path for the specified docID … … 254 272 } 255 273 256 # Obtain the collect dir 257 my $collect_dir = &util::filename_cat($gsdl_home, "collect"); 274 # Derive the archives dir 275 my $site = $self->{'site'}; 276 my $collect_dir = $gsdl_cgi->get_collection_dir($site); 277 278 my $archive_dir = &util::filename_cat($collect_dir,$collect,"archives"); 279 ##my $archive_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"archives"); 258 280 259 281 # Make sure the collection isn't locked by someone else
Note:
See TracChangeset
for help on using the changeset viewer.