Changeset 23363 for main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

Timestamp:

2010-12-01T11:42:27+13:00 (13 years ago)

Author:

davidb

Message:

Plugin code upgrade to support Greenstone working with filenames under Windows when then go beyond Latin-1 and start turning up in their DOS abbreviated form (e.g. Test~1.txt)

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (11 diffs)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -414 +414 @@
     my ($filename_full_path, $block_hash) = @_;
 
+    $filename_full_path = &util::upgrade_if_dos_filename($filename_full_path);
+
     if ($self->{'block_exp'} ne "" && $filename_full_path =~ /$self->{'block_exp'}/) {
     $block_hash->{'file_blocks'}->{$filename_full_path} = 1;
@@ -426 +428 @@
     my ($filename, $block_hash) = @_;
 
+    $filename = &util::upgrade_if_dos_filename($filename);
+
     if ($self->{'cover_image'}) {
     my $coverfile = $filename;
     $coverfile =~ s/\.[^\\\/\.]+$/\.jpg/;
-    if (!-e $coverfile) {
+    if (!&util::fd_exists($coverfile)) {
         $coverfile =~ s/jpg$/JPG/;
     }   
-    if (-e $coverfile) {
+    if (&util::fd_exists($coverfile)) {
         $block_hash->{'file_blocks'}->{$coverfile} = 1;
     } 
@@ -915 +919 @@
     # UTF-8 version of filename
     if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
-    print STDERR "****** Setting Source Metadata given: $octet_file\n";
+    print STDERR "**** Setting Source Metadata given: $octet_file\n";
     }
     
@@ -950 +954 @@
     
     if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
-    print STDERR "***** saving Source as:             $url_encoded_filename\n";
+    print STDERR "****** saving Source as:             $url_encoded_filename\n";
     }
     
@@ -966 +970 @@
 
     if ((defined $ENV{"DEBUG_UNICODE"}) && ($ENV{"DEBUG_UNICODE"})) {
-    print STDERR "***** saving SourceFile as:         $renamed_raw_url\n";
+    print STDERR "****** saving SourceFile as:         $renamed_raw_url\n";
     }
 }
@@ -1014 +1018 @@
     # should we move this to read? What about secondary plugins?
     print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
-    print $outhandle "$self->{'plugin_type'} processing $file\n"
+    my $pp_file = &util::prettyprint_file($base_dir,$file);
+    print $outhandle "$self->{'plugin_type'} processing $pp_file\n"
         if $self->{'verbosity'} > 1;
 
@@ -1296 +1301 @@
         my $zip_filename = $metadata->{$field};
         # overwrite the source_path
-        $doc_obj->{'source_path'} = $zip_filename;
+        $doc_obj->set_source_path($zip_filename);
         # and set the metadata
         $zip_filename = &util::filename_within_collection($zip_filename);
@@ -1337 +1342 @@
     my ($doc_obj, $filename) = @_;
 
+    my $upgraded_filename = &util::upgrade_if_dos_filename($filename);
+
     $filename =~ s/\.[^\\\/\.]+$/\.jpg/;
-    if (exists $self->{'covers_missing_cache'}->{$filename}) {
-    # don't stat() for existence eg for multiple document input files
+    $upgraded_filename =~ s/\.[^\\\/\.]+$/\.jpg/;
+
+    if (exists $self->{'covers_missing_cache'}->{$upgraded_filename}) {
+    # don't stat() for existence e.g. for multiple document input files
     # (eg SplitPlug)
     return;
@@ -1346 +1355 @@
     my $top_section=$doc_obj->get_top_section();
 
-    if (-e $filename) {
+    if (&util::fd_exists($upgraded_filename)) {
     $doc_obj->associate_source_file($filename);
         $doc_obj->associate_file($filename, "cover.jpg", "image/jpeg");
@@ -1352 +1361 @@
     } else {
     my $upper_filename = $filename;
+    my $upgraded_upper_filename = $upgraded_filename;
+
     $upper_filename =~ s/jpg$/JPG/;
-    if (-e $upper_filename) {
+    $upgraded_upper_filename =~ s/jpg$/JPG/;
+
+    if (&util::fd_exists($upgraded_upper_filename)) {
         $doc_obj->associate_source_file($upper_filename);
         $doc_obj->associate_file($upper_filename, "cover.jpg",
@@ -1361 +1374 @@
         # file doesn't exist, so record the fact that it's missing so
         # we don't stat() again (stat is slow)
-        $self->{'covers_missing_cache'}->{$filename} = 1;
+        $self->{'covers_missing_cache'}->{$upgraded_filename} = 1;
     }
     }