Changeset 31480 for main/trunk/greenstone2

Timestamp:

2017-03-09T14:35:57+13:00 (7 years ago)

Author:

kjdon

Message:

util::block_file moved to EncodingUtil::block_raw_filename

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• DSpacePlugin.pm (modified) (1 diff)
• GreenstoneXMLPlugin.pm (modified) (2 diffs)
• HTMLPlugin.pm (modified) (2 diffs)
• HathiTrustMETSPlugin.pm (modified) (2 diffs)
• ISISPlugin.pm (modified) (1 diff)
• MetadataCSVPlugin.pm (modified) (1 diff)
• MetadataXMLPlugin.pm (modified) (1 diff)
• PagedImagePlugin.pm (modified) (2 diffs)

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

@@ -152 +152 @@
 
     if (&FileUtils::fileTest($handle_filename)) {
-    &util::block_filename($block_hash,$handle_filename);
+    $self->block_raw_filename($block_hash,$handle_filename);
     }
 }

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

@@ -110 +110 @@
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
     
-    print $outhandle "GreenstoneXMLlugin: setting up block list for $file\n"
+    print $outhandle "GreenstoneXMLPlugin: setting up block list for $file\n"
     if $self->{'verbosity'} > 1;
 
@@ -126 +126 @@
         }
 
-        &util::block_filename($block_hash,$full_gsdl_assoc_filename);       
+        # is this raw filename here, or unicode?? assuming unicode
+        # however we have concatenated raw directory???
+        $self->block_filename($block_hash,$full_gsdl_assoc_filename);       
         }
     }

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

@@ -290 +290 @@
         if($unicode_url_original_filename ne $unicode_html_fname) {
             # Allow for possibility of raw byte version and Unicode versions of file
-            &util::block_filename($block_hash,$unicode_url_original_filename);
+            $self->block_filename($block_hash,$unicode_url_original_filename);
         }
     }
 
     # $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
-    &util::block_filename($block_hash,$url_original_filename) if $url_original_filename ne $html_fname;
+    # TODO now use unicode files in block, do we need this??
+    #$self->block_raw_filename($block_hash,$url_original_filename) if $url_original_filename ne $html_fname;
 
     # but only add the linked file to the blocklist if the current html file does not link to itself
@@ -1292 +1293 @@
         $unicode_dirname = &unicode::raw_filename_to_url_encoded($dirname);
         }
-    
+        print STDERR "unicode dirname = ".&unicode::debug_unicode_string($unicode_dirname)."\n";
         $before_hash = &FileUtils::filenameConcatenate($unicode_dirname, $before_hash);
         $before_hash = $self->eval_dir_dots($before_hash);   

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

@@ -514 +514 @@
     my ($file_root) = ($filename_full_path =~ m/^(.*)\.mets\.xml$/);
 
-    &util::block_filename($block_hash,"$file_root.zip");
-    &util::block_filename($block_hash,"$file_root.json");
+    $self->block_raw_filename($block_hash,"$file_root.zip");
+    $self->block_raw_filename($block_hash,"$file_root.json");
 
     my $page_dir = $file_root;
@@ -530 +530 @@
         my $txt_filename = &FileUtils::filenameConcatenate($page_dir,$1);
         my $topics_filename = $txt_filename . ".topics";
-        &util::block_filename($block_hash,$txt_filename);
-        &util::block_filename($block_hash,$topics_filename);
+        $self->block_raw_filename($block_hash,$txt_filename);
+        $self->block_raw_filename($block_hash,$topics_filename);
     }
     }

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

@@ -143 +143 @@
     print STDERR "$self->{'fdt_file_path'}\n";
     my $fdt_file = $self->{'fdt_file_path'};
-    &util::block_filename($block_hash,$fdt_file);
+    $self->block_raw_filename($block_hash,$fdt_file);
     }
     if (-e $self->{'xrf_file_path'}) {
     print STDERR "$self->{'xrf_file_path'}\n";
     my $xrf_file = $self->{'xrf_file_path'};
-    &util::block_filename($block_hash,$xrf_file);
+    $self->block_raw_filename($block_hash,$xrf_file);
     }
     

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

@@ -120 +120 @@
 
     # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
-    &util::block_filename($block_hash,$filename);
+    $self->block_raw_filename($block_hash,$filename);
 
 

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

@@ -258 +258 @@
     print $outhandle "MetadataXMLPlugin: processing $file\n" if ($self->{'verbosity'})> 1;
     # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
-    &util::block_filename($block_hash,$filename);
+    $self->block_raw_filename($block_hash,$filename);
 
     $self->{'metadataref'} = $extrametadata;

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

@@ -647 +647 @@
 
     if ($line =~ /imgfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
+        $self->block_raw_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     }
     if ($line =~ /txtfile=\"([^\"]+)\"/) {
-        &util::block_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
+        $self->block_raw_filename($block_hash,&FileUtils::filenameConcatenate($dir,$1));
     }
     }
@@ -677 +677 @@
     # find the image file if there is one
     if (defined $imgname && $imgname ne "") {
-        &util::block_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
+        $self->block_raw_filename($block_hash, &FileUtils::filenameConcatenate( $dir,$imgname));
     }
     # find the text file if there is one
     if (defined $txtname && $txtname ne "") {
-        &util::block_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
+        $self->block_raw_filename($block_hash, &FileUtils::filenameConcatenate($dir,$txtname));
     }
     }