Changeset 27882 for main/trunk/greenstone2

Timestamp:

2013-07-16T21:51:50+12:00 (11 years ago)

Author:

ak19

Message:

Replacing deprecated calls to util:: subroutines with calls to FileUtils variants.

File:

• main/trunk/greenstone2/perllib/plugouts/DSpacePlugout.pm (modified) (11 diffs)

main/trunk/greenstone2/perllib/plugouts/DSpacePlugout.pm

@@ -31 +31 @@
 eval {require bytes};
 use util;
+use FileUtils;
 use BasePlugout;
 
@@ -74 +75 @@
     my $docroot_attributes = "schema=\"$metadata_prefix\"";
  
-    my $doc_dc_file = &util::filename_cat ($working_dir, $metadata_file);
+    my $doc_dc_file = &FileUtils::filenameConcatenate ($working_dir, $metadata_file);
     $self->open_xslt_pipe($doc_dc_file,$self->{'xslt_file'});
 
@@ -165 +166 @@
 
     my $output_dir = $self->get_output_dir();
-    &util::mk_all_dir ($output_dir) unless -e $output_dir;
-
-    my $working_dir = &util::filename_cat ($output_dir, $doc_dir);    
-    &util::mk_all_dir ($working_dir, $doc_dir);
+    &FileUtils::makeAllDirectories ($output_dir) unless -e $output_dir;
+
+    my $working_dir = &FileUtils::filenameConcatenate ($output_dir, $doc_dir);    
+    &FileUtils::makeAllDirectories ($working_dir, $doc_dir);
 
     #########################
@@ -179 +180 @@
         # Genereate handle file 
         # (Note: this section of code would benefit from being restructured)
-        my $doc_handle_file = &util::filename_cat ($working_dir, "handle");
+        my $doc_handle_file = &FileUtils::filenameConcatenate ($working_dir, "handle");
     
         my $env_hp = $ENV{'DSPACE_HANDLE_PREFIX'};
@@ -196 +197 @@
     # save the content file
     #########################
-    my $doc_contents_file = &util::filename_cat ($working_dir, "contents");
+    my $doc_contents_file = &FileUtils::filenameConcatenate ($working_dir, "contents");
     
     my $outhandler =  $self->get_output_handler($doc_contents_file);
@@ -209 +210 @@
     # save the dublin_core.xml file
     ###############################
-#      my $doc_dc_file = &util::filename_cat ($working_dir, "dublin_core.xml");
+#      my $doc_dc_file = &FileUtils::filenameConcatenate ($working_dir, "dublin_core.xml");
 #      $self->open_xslt_pipe($doc_dc_file,$self->{'xslt_file'});
 
@@ -245 +246 @@
     }
 
-    $self->{'short_doc_file'} =  &util::filename_cat ($doc_dir, "dublin_core.xml"); 
+    $self->{'short_doc_file'} =  &FileUtils::filenameConcatenate ($doc_dir, "dublin_core.xml"); 
     $self->store_output_info_reference($doc_obj);
 }
@@ -258 +259 @@
     return if (!defined $output_dir);
 
-    my $working_dir = &util::filename_cat($output_dir, $doc_dir);
+    my $working_dir = &FileUtils::filenameConcatenate($output_dir, $doc_dir);
 
     my @assoc_files = ();
@@ -276 +277 @@
     # This test is never going to fail on Windows -- is this a problem?
     if ($source_filename !~ /^$dirsep_regexp/) {
-        $source_filename = &util::filename_cat($collect_dir, $source_filename);
+        $source_filename = &FileUtils::filenameConcatenate($collect_dir, $source_filename);
     }
     }
@@ -284 +285 @@
     print $handle "$tail_filename\n";
     
-    $filename = &util::filename_cat($working_dir, $tail_filename);
-    &util::hard_link ($source_filename, $filename, $self->{'verbosity'});
+    $filename = &FileUtils::filenameConcatenate($working_dir, $tail_filename);
+    &FileUtils::hardLink ($source_filename, $filename, $self->{'verbosity'});
              
     # set the assocfile path (even if we have no assoc files - need this for lucene)
@@ -318 +319 @@
         }
     
-        $filename = &util::filename_cat($working_dir, $afile);
+        $filename = &FileUtils::filenameConcatenate($working_dir, $afile);
         
         if ($afile ne "cover.jpg") {
-            &util::hard_link ($real_filename, $filename, $self->{'verbosity'});
+            &FileUtils::hardLink ($real_filename, $filename, $self->{'verbosity'});
             $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),
                  "gsdlassocfile",