Changeset 31690 for main/trunk/greenstone2
- Timestamp:
- 2017-05-18T14:40:47+12:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm
r31494 r31690 271 271 return $directory_ok unless (defined $directory_ok && $directory_ok == 1); 272 272 273 print $outhandle "Global file scan checking directory: $dirname\n" ;273 print $outhandle "Global file scan checking directory: $dirname\n" if ($verbosity > 2); 274 274 275 275 $block_hash->{'all_files'} = {} unless defined $block_hash->{'all_files'}; … … 436 436 my $raw_full_filename = &FileUtils::filenameConcatenate($this_file_base_dir, $raw_file_subfile); 437 437 if ($self->raw_file_is_blocked($block_hash, $raw_full_filename)) { 438 print STDERR "DirectoryPlugin: file $raw_full_filename was blocked for metadata_read\n";# if ($verbosity > 2); 439 print STDERR "raw file was blocked for metadata read\n"; 440 print STDERR &unicode::debug_unicode_string($raw_full_filename)."\n"; 438 print STDERR "DirectoryPlugin: file $raw_full_filename was blocked for metadata_read\n" if ($verbosity > 2); 441 439 next; 442 440 } 443 441 444 442 # Recursively read each $raw_subfile 445 print $outhandle "DirectoryPlugin metadata recurring: $raw_subfile\n" ; #if ($verbosity > 2);443 print $outhandle "DirectoryPlugin metadata recurring: $raw_subfile\n" if ($verbosity > 2); 446 444 447 445 &plugin::metadata_read ($pluginfo, $this_file_base_dir, … … 521 519 = &FileUtils::filenameConcatenate($this_file_base_dir,$raw_file_subfile); 522 520 my $full_unicode_file = $self->raw_filename_to_unicode($raw_full_filename); 523 print STDERR "full unicode filename $full_unicode_file\n"; 524 print STDERR &unicode::debug_unicode_string($full_unicode_file)."\n"; 521 525 522 if ($self->file_is_blocked($block_hash,$full_unicode_file)) { 526 print STDERR "Actually, we have blocked the unicode version\n";527 523 next; 528 524 } 529 525 if ($self->file_is_blocked($block_hash,$raw_full_filename)) { 530 print STDERR "DirectoryPlugin: file $raw_full_filename was blocked for read\n" ; #if ($verbosity > 2);526 print STDERR "DirectoryPlugin: file $raw_full_filename was blocked for read\n" if ($verbosity > 2); 531 527 next; 532 528 }
Note:
See TracChangeset
for help on using the changeset viewer.