Changeset 31688 for main/trunk/greenstone2/perllib/plugins
- Timestamp:
- 2017-05-18T14:39:49+12:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/CommonUtil.pm
r31494 r31688 119 119 my ($verbosity, $outhandle, $failhandle) = @_; 120 120 121 print STDERR "guess encoding = ".$self->guess_filesystem_encoding()."\n";122 print STDERR "get encoding = ".$self->get_filesystem_encoding()."\n";123 124 121 # verbosity is passed through from the processor 125 122 $self->{'verbosity'} = $verbosity; … … 487 484 488 485 } 489 print STDERR "guessing filesystem encoding is $deduced_filename_encoding\n"; 490 return $deduced_filename_encoding; 486 return $deduced_filename_encoding; 491 487 } 492 488 … … 589 585 my $self = shift (@_); 590 586 my ($block_hash,$filename_full_path) = @_; 591 print STDERR "in block filename $filename_full_path\n";592 print STDERR &unicode::debug_unicode_string($filename_full_path)."\n";593 587 594 588 if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) { … … 603 597 # we need to normalize the filenames 604 598 my $composed_filename_full_path = normalize('C', $filename_full_path); 605 print STDERR "darwin, composed filename =". &unicode::debug_unicode_string($composed_filename_full_path)."\n";599 ## print STDERR "darwin, composed filename =". &unicode::debug_unicode_string($composed_filename_full_path)."\n"; 606 600 $block_hash->{'file_blocks'}->{$composed_filename_full_path} = 1; 607 601 } … … 628 622 629 623 # 630 print STDERR "in file is blocked $filename_full_path\n";631 print STDERR &unicode::debug_unicode_string($filename_full_path)."\n";632 624 if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) { 633 625 # convert to long filenames if needed … … 644 636 # on mac, we want composed form in the block hash 645 637 my $composed_form = normalize('C', $filename_full_path); 646 print STDERR "gsdlos = darwin, composed = ". &unicode::debug_unicode_string($composed_form) ."\n";647 638 if (defined $block_hash->{'file_blocks'}->{$composed_form}) { 648 639 $self->{'num_blocked'} ++; 649 print STDERR "BLOCKED 1\n";650 640 return 1; 651 641 } … … 655 645 if (defined $block_hash->{'file_blocks'}->{$filename_full_path}) { 656 646 $self->{'num_blocked'} ++; 657 print STDERR "BLOCKED\n";658 647 return 1; 659 648 } … … 664 653 return 1; # blocked 665 654 } 666 print STDERR "NOT BLOCKED\n";667 655 return 0; 668 656 }
Note:
See TracChangeset
for help on using the changeset viewer.