Changeset 30427
- Timestamp:
- 2016-03-22T16:21:47+13:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/BaseMediaConverter.pm
r27982 r30427 88 88 $collect_dir =~ s/\\/\//g; # Work in Unix style world 89 89 90 ## print STDERR "**** base_dir = ", $base_dir, "\n";91 92 90 # Work out relative filename within 'base_dir' 93 91 $filename =~ s/\\/\//g; 94 92 $base_dir =~ s/\\/\//g; 95 93 my ($file) = ($filename =~ m/^$base_dir(.*?)$/); 96 94 97 95 if (!defined $file) { 98 96 # Perhaps the filename is taken from within cache_dir area? 99 my $prev_cached_dir = $self->{'cached_dir'}; 100 ($file) = ($filename =~ m/^$prev_cached_dir(.*?)$/); 97 my $cached_dir = &FileUtils::filenameConcatenate($collect_dir,"cached"); 98 ($file) = ($filename =~ m/^$cached_dir(.*?)$/); 99 # A cached name already has the fileroot baked -in as the last directory name 100 # => strip it out 101 $file =~ s/[\/\\][^\/\\]+([\/\\][^\/\\]*)$/$1/; 102 103 # Commented out code is the previous version that looked to 104 # handle this situation, but ran foul of situtation where 105 # sub-directories within 'import' are used 106 # 107 # # Perhaps the filename is taken from within cache_dir area? 108 # my $prev_cached_dir = $self->{'cached_dir'}; 109 # ($file) = ($filename =~ m/^$prev_cached_dir(.*?)$/); 101 110 } 102 111 … … 108 117 my ($file_root, $dirname, $suffix) 109 118 = &File::Basename::fileparse($file, "\\.[^\\.]+\$"); 110 111 119 112 120 # if dirname is in collections tmp area, remove collect_dir prefix … … 119 127 120 128 my $base_output_dir = &FileUtils::filenameConcatenate($collect_dir,"cached",$dirname); 129 ## my $base_output_dir = &FileUtils::filenameConcatenate($collect_dir,"cached",$dirname); 121 130 122 131 if (!-e $base_output_dir ) {
Note:
See TracChangeset
for help on using the changeset viewer.