Changeset 28562 for main/trunk/greenstone2/perllib/plugouts/METSPlugout.pm

Timestamp:

2013-10-31T11:27:57+13:00 (10 years ago)

Author:

kjdon

Message:

changing some util:: methods to FileUtils:: methods

File:

• main/trunk/greenstone2/perllib/plugouts/METSPlugout.pm (modified) (5 diffs)

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

@@ -33 +33 @@
 
 eval {require bytes};
-use util;
+use FileUtils;
 use BasePlugout;
 use docprint; # for escape_text
@@ -82 +82 @@
     my $is_recursive = 1;
 
-    my $doc_txt_file = &util::filename_cat ($working_dir,"doctxt.xml"); 
+    my $doc_txt_file = &FileUtils::filenameConcatenate ($working_dir,"doctxt.xml"); 
     
     $self->open_xslt_pipe($doc_txt_file,$self->{'xslt_txt'});
@@ -117 +117 @@
     my ($doc_obj,$working_dir) = @_;
 
-    my $doc_mets_file = &util::filename_cat ($working_dir, "docmets.xml");
+    my $doc_mets_file = &FileUtils::filenameConcatenate ($working_dir, "docmets.xml");
     
     my $doc_title = $doc_obj->get_metadata_element($doc_obj->get_top_section(),"dc.Title");
@@ -161 +161 @@
 
     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);              
+    &FileUtils::makeAllDirectories ($output_dir) unless -e $output_dir;
+ 
+    my $working_dir = &FileUtils::filenameConcatenate ($output_dir, $doc_dir);              
    
-    &util::mk_all_dir ($working_dir) unless -e $working_dir;
+    &FileUtils::makeAllDirectories ($working_dir) unless -e $working_dir;
 
     ###
@@ -177 +177 @@
     $self->saveas_docmets($doc_obj,$working_dir);
 
-    $self->{'short_doc_file'} =  &util::filename_cat ($doc_dir, "docmets.xml");
+    $self->{'short_doc_file'} =  &FileUtils::filenameConcatenate ($doc_dir, "docmets.xml");
   
     $self->store_output_info_reference($doc_obj);