Changeset 28563 for main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm

Timestamp:

2013-10-31T11:29:37+13:00 (10 years ago)

Author:

kjdon

Message:

changing some util:: methods to FileUtils:: methods

File:

• main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm (modified) (7 diffs)

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

@@ -51 +51 @@
 use plugin;
 use util;
+use FileUtils;
 use XMLParser;
 use strict;
@@ -148 +149 @@
 
     my ($tailname, $contents_basedir, $suffix) = &File::Basename::fileparse($filename_full_path, "\\.[^\\.]+\$");
-    my $handle_filename = &util::filename_cat($contents_basedir,"handle");
-
-    if (&util::fd_exists($handle_filename)) {
+    my $handle_filename = &FileUtils::filenameConcatenate($contents_basedir,"handle");
+
+    if (&FileUtils::fileTest($handle_filename)) {
     &util::block_filename($block_hash,$handle_filename);
     }
@@ -164 +165 @@
     my @assocmime_list = ();
 
-    my $content_fname = &util::filename_cat($dir,"contents");
+    my $content_fname = &FileUtils::filenameConcatenate($dir,"contents");
 
     open(CIN,"<$content_fname") 
@@ -274 +275 @@
     my $outhandle = $self->{'outhandle'};
     
-    my $filename = &util::filename_cat($base_dir, $file);
+    my $filename = &FileUtils::filenameConcatenate($base_dir, $file);
     # return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;
     
@@ -302 +303 @@
     if ($only_first_doc || $first_inorder_ext || $first_inorder_mime) { 
     foreach my $afm ( @$assoc_file_mimes ) {
-        my $full_af = &util::filename_cat($dir,$afm->{'file'});
+        my $full_af = &FileUtils::filenameConcatenate($dir,$afm->{'file'});
         $self->{'extra_blocks'}->{$full_af} = 1;
     }
@@ -334 +335 @@
 
     my @gsdlassocfile_tobe 
-        = map { &util::filename_cat($dir,$_->{'file'}) .":".$_->{'mimetype'}.":" } @$assoc_file_mimes if @$assoc_file_mimes;
+        = map { &FileUtils::filenameConcatenate($dir,$_->{'file'}) .":".$_->{'mimetype'}.":" } @$assoc_file_mimes if @$assoc_file_mimes;
     $self->{'saved_metadata'}->{'gsdlassocfile_tobe'} = \@gsdlassocfile_tobe;
 
@@ -355 +356 @@
     
     # Block all files except contents
-    my $filename = &util::filename_cat($base_dir, $file);
+    my $filename = &FileUtils::filenameConcatenate($base_dir, $file);
     return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;