Changeset 28562 for main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.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/FedoraMETSPlugout.pm (modified) (6 diffs)

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

@@ -137 +137 @@
     $section_fnum =~ s/\./_/g;
 
-    my $doc_txt_file = &util::filename_cat ($working_dir,"doctxt$section_fnum.xml");    
+    my $doc_txt_file = &FileUtils::filenameConcatenate ($working_dir,"doctxt$section_fnum.xml");    
     
     $self->open_xslt_pipe($doc_txt_file,$self->{'xslt_txt'});
@@ -280 +280 @@
     if ($num_subsections>0) {
 
-    my $doc_txt_file = &util::filename_cat ($working_dir,"doctoc.xml");
+    my $doc_txt_file = &FileUtils::filenameConcatenate ($working_dir,"doctoc.xml");
     
     $self->open_xslt_pipe($doc_txt_file,$self->{'xslt_txt'});
@@ -601 +601 @@
     if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server
         if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place
-        $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+        $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'},"sites","localsite");
         } 
         else { # try the default location for the web directory
-        $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
+        $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
         }
     }
@@ -612 +612 @@
     }
     
-    my $gsdl_href = &util::filename_cat($working_dir, $fname);
+    my $gsdl_href = &FileUtils::filenameConcatenate($working_dir, $fname);
     $collectparent = &util::filename_to_regex($collectparent); # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
     $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
     $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
-    my $localfedora = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
+    my $localfedora = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
     
     my $greenstone_url_prefix = &util::get_greenstone_url_prefix();
@@ -732 +732 @@
            if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server
            if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place
-               $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");
+               $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'},"sites","localsite");
            } 
            else { # try the default location for the web directory
-               $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
+               $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite");
            }
            }          
@@ -743 +743 @@
            }
 
-           my $gsdl_href = &util::filename_cat($working_dir,$assfilePath);
+           my $gsdl_href = &FileUtils::filenameConcatenate($working_dir,$assfilePath);
            $collectparent = &util::filename_to_regex($collectparent); # escape reserved metacharacter \ in path (by replacing it with \\) for substitution
            $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash
            $gsdl_href =~ s/\\/\//g;                   # make sure we have url paths (which only use / not \)
-           my $localfedora = &util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
+           my $localfedora = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");
 
            my $greenstone_url_prefix = &util::get_greenstone_url_prefix();