Changeset 28562
- Timestamp:
- 2013-10-31T11:27:57+13:00 (11 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugouts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugouts/FedoraMETSPlugout.pm
r24829 r28562 137 137 $section_fnum =~ s/\./_/g; 138 138 139 my $doc_txt_file = & util::filename_cat($working_dir,"doctxt$section_fnum.xml");139 my $doc_txt_file = &FileUtils::filenameConcatenate ($working_dir,"doctxt$section_fnum.xml"); 140 140 141 141 $self->open_xslt_pipe($doc_txt_file,$self->{'xslt_txt'}); … … 280 280 if ($num_subsections>0) { 281 281 282 my $doc_txt_file = & util::filename_cat($working_dir,"doctoc.xml");282 my $doc_txt_file = &FileUtils::filenameConcatenate ($working_dir,"doctoc.xml"); 283 283 284 284 $self->open_xslt_pipe($doc_txt_file,$self->{'xslt_txt'}); … … 601 601 if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server 602 602 if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place 603 $collectparent = & util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");603 $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'},"sites","localsite"); 604 604 } 605 605 else { # try the default location for the web directory 606 $collectparent = & util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");606 $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite"); 607 607 } 608 608 } … … 612 612 } 613 613 614 my $gsdl_href = & util::filename_cat($working_dir, $fname);614 my $gsdl_href = &FileUtils::filenameConcatenate($working_dir, $fname); 615 615 $collectparent = &util::filename_to_regex($collectparent); # escape reserved metacharacter \ in path (by replacing it with \\) for substitution 616 616 $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash 617 617 $gsdl_href =~ s/\\/\//g; # make sure we have url paths (which only use / not \) 618 my $localfedora = & util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");618 my $localfedora = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml"); 619 619 620 620 my $greenstone_url_prefix = &util::get_greenstone_url_prefix(); … … 732 732 if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server 733 733 if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place 734 $collectparent = & util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite");734 $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'},"sites","localsite"); 735 735 } 736 736 else { # try the default location for the web directory 737 $collectparent = & util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite");737 $collectparent = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite"); 738 738 } 739 739 } … … 743 743 } 744 744 745 my $gsdl_href = & util::filename_cat($working_dir,$assfilePath);745 my $gsdl_href = &FileUtils::filenameConcatenate($working_dir,$assfilePath); 746 746 $collectparent = &util::filename_to_regex($collectparent); # escape reserved metacharacter \ in path (by replacing it with \\) for substitution 747 747 $gsdl_href =~ s/^$collectparent(\/|\\)?//; # remove the collectparent path in gsdl_href and any trailing slash 748 748 $gsdl_href =~ s/\\/\//g; # make sure we have url paths (which only use / not \) 749 my $localfedora = & util::filename_cat($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml");749 my $localfedora = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "packages", "tomcat", "conf", "Catalina", "localhost", "fedora.xml"); 750 750 751 751 my $greenstone_url_prefix = &util::get_greenstone_url_prefix(); -
main/trunk/greenstone2/perllib/plugouts/MARCXMLPlugout.pm
r20962 r28562 31 31 eval {require bytes}; 32 32 use util; 33 use FileUtils; 33 34 use BasePlugout; 34 35 use docprint; # for escape_text … … 103 104 104 105 my $output_dir = $self->get_output_dir(); 105 & util::mk_all_dir($output_dir) unless -e $output_dir;106 &FileUtils::makeAllDirectories ($output_dir) unless -e $output_dir; 106 107 107 my $working_dir = & util::filename_cat($output_dir, $doc_dir);108 & util::mk_all_dir($working_dir) unless -e $working_dir;108 my $working_dir = &FileUtils::filenameConcatenate ($output_dir, $doc_dir); 109 &FileUtils::makeAllDirectories ($working_dir) unless -e $working_dir; 109 110 110 my $output_file = util::filename_cat($working_dir, "marc.xml");111 my $output_file = &FileUtils::filenameConcatenate ($working_dir, "marc.xml"); 111 112 112 113 $self->open_xslt_pipe($output_file,$self->{'xslt_file'}); … … 119 120 $self->close_xslt_pipe(); 120 121 121 $self->{'short_doc_file'} = util::filename_cat($doc_dir, "marc.xml");122 $self->{'short_doc_file'} = &FileUtils::filenameConcatenate ($doc_dir, "marc.xml"); 122 123 123 124 $self->store_output_info_reference($doc_obj); … … 154 155 155 156 my $output_dir = $self->get_output_dir(); 156 & util::mk_all_dir($output_dir) unless -e $output_dir;157 &FileUtils::makeAllDirectories ($output_dir) unless -e $output_dir; 157 158 158 my $output_file = util::filename_cat($output_dir, "marc.xml");159 my $output_file = &FileUtils::filenameConcatenate($output_dir, "marc.xml"); 159 160 160 161 $self->open_xslt_pipe($output_file,$self->{'xslt_file'}); -
main/trunk/greenstone2/perllib/plugouts/METSPlugout.pm
r22839 r28562 33 33 34 34 eval {require bytes}; 35 use util;35 use FileUtils; 36 36 use BasePlugout; 37 37 use docprint; # for escape_text … … 82 82 my $is_recursive = 1; 83 83 84 my $doc_txt_file = & util::filename_cat($working_dir,"doctxt.xml");84 my $doc_txt_file = &FileUtils::filenameConcatenate ($working_dir,"doctxt.xml"); 85 85 86 86 $self->open_xslt_pipe($doc_txt_file,$self->{'xslt_txt'}); … … 117 117 my ($doc_obj,$working_dir) = @_; 118 118 119 my $doc_mets_file = & util::filename_cat($working_dir, "docmets.xml");119 my $doc_mets_file = &FileUtils::filenameConcatenate ($working_dir, "docmets.xml"); 120 120 121 121 my $doc_title = $doc_obj->get_metadata_element($doc_obj->get_top_section(),"dc.Title"); … … 161 161 162 162 my $output_dir = $self->get_output_dir(); 163 & util::mk_all_dir($output_dir) unless -e $output_dir;164 165 my $working_dir = & util::filename_cat($output_dir, $doc_dir);163 &FileUtils::makeAllDirectories ($output_dir) unless -e $output_dir; 164 165 my $working_dir = &FileUtils::filenameConcatenate ($output_dir, $doc_dir); 166 166 167 & util::mk_all_dir($working_dir) unless -e $working_dir;167 &FileUtils::makeAllDirectories ($working_dir) unless -e $working_dir; 168 168 169 169 ### … … 177 177 $self->saveas_docmets($doc_obj,$working_dir); 178 178 179 $self->{'short_doc_file'} = & util::filename_cat($doc_dir, "docmets.xml");179 $self->{'short_doc_file'} = &FileUtils::filenameConcatenate ($doc_dir, "docmets.xml"); 180 180 181 181 $self->store_output_info_reference($doc_obj);
Note:
See TracChangeset
for help on using the changeset viewer.