Changeset 30624 for main/trunk
- Timestamp:
- 2016-07-26T19:24:33+12:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm
r27318 r30624 513 513 # assume the GS3 web folder is in the default location 514 514 if(!defined $gsdl3home) { 515 $gsdl3home = & util::filename_cat($ENV{'GSDL3SRCHOME'}, "web");515 $gsdl3home = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "web"); 516 516 $self->{'gsdl3home'} = $gsdl3home; 517 517 } … … 519 519 } 520 520 521 my $gsdl_bin_script = & util::filename_cat($gsdlhome,"bin","script");521 my $gsdl_bin_script = &FileUtils::filenameConcatenate($gsdlhome,"bin","script"); 522 522 &util::envvar_prepend("PATH",$gsdl_bin_script); 523 523 524 my $gsdl_bin_os = & util::filename_cat($gsdlhome,"bin",$gsdlos);524 my $gsdl_bin_os = &FileUtils::filenameConcatenate($gsdlhome,"bin",$gsdlos); 525 525 &util::envvar_prepend("PATH",$gsdl_bin_os); 526 526 527 527 # set up ImageMagick for the remote server in parallel to what setup.bash does 528 my $magick_home = & util::filename_cat($gsdl_bin_os,"imagemagick");528 my $magick_home = &FileUtils::filenameConcatenate($gsdl_bin_os,"imagemagick"); 529 529 if(-e $magick_home) { 530 530 &util::envvar_prepend("PATH", $magick_home); … … 534 534 # no harm (that I can see) in keeping them in 535 535 536 my $magick_bin = & util::filename_cat($magick_home,"bin");537 my $magick_lib = & util::filename_cat($magick_home,"lib");536 my $magick_bin = &FileUtils::filenameConcatenate($magick_home,"bin"); 537 my $magick_lib = &FileUtils::filenameConcatenate($magick_home,"lib"); 538 538 539 539 &util::envvar_prepend("PATH", $magick_bin); … … 552 552 553 553 # set up GhostScript for the remote server in parallel to what setup.bash does 554 my $ghostscript_home = & util::filename_cat($gsdl_bin_os,"ghostscript");554 my $ghostscript_home = &FileUtils::filenameConcatenate($gsdl_bin_os,"ghostscript"); 555 555 if(-e $ghostscript_home) { 556 my $ghostscript_bin = & util::filename_cat($ghostscript_home,"bin");556 my $ghostscript_bin = &FileUtils::filenameConcatenate($ghostscript_home,"bin"); 557 557 &util::envvar_prepend("PATH", $ghostscript_bin); 558 558 559 559 if(!defined $ENV{'GS_LIB'} || $ENV{'GS_LIB'} eq "") { 560 $ENV{'GS_LIB'} = & util::filename_cat($ghostscript_home,"share","ghostscript","8.63","lib");560 $ENV{'GS_LIB'} = &FileUtils::filenameConcatenate($ghostscript_home,"share","ghostscript","8.63","lib"); 561 561 } 562 562 if(!defined $ENV{'GS_FONTPATH'} || $ENV{'GS_FONTPATH'} eq "") { 563 $ENV{'GS_FONTPATH'} = & util::filename_cat($ghostscript_home,"share","ghostscript","8.63","Resource","Font");563 $ENV{'GS_FONTPATH'} = &FileUtils::filenameConcatenate($ghostscript_home,"share","ghostscript","8.63","Resource","Font"); 564 564 } 565 565 } … … 574 574 #my ($perl_home) = ($perl_bin_dir =~ m/(.*)[\\|\/]bin[\\|\/]?$/); 575 575 my ($tailname,$perl_home) = File::Basename::fileparse($perl_bin_dir, "\\.(?:[^\\.]+?)\$"); 576 $ENV{'PERL5LIB'} = & util::filename_cat($perl_home, "lib");576 $ENV{'PERL5LIB'} = &FileUtils::filenameConcatenate($perl_home, "lib"); 577 577 578 578 if($gsdlos eq "darwin") { 579 &util::envvar_prepend("DYLD_LIBRARY_PATH", & util::filename_cat($perl_home,"5.8.9","darwin-thread-multi-2level","CORE"));579 &util::envvar_prepend("DYLD_LIBRARY_PATH", &FileUtils::filenameConcatenate($perl_home,"5.8.9","darwin-thread-multi-2level","CORE")); 580 580 } elsif($gsdlos eq "linux") { 581 &util::envvar_prepend("LD_LIBRARY_PATH", & util::filename_cat($perl_home,"5.8.9","i686-linux-thread-multi","CORE"));581 &util::envvar_prepend("LD_LIBRARY_PATH", &FileUtils::filenameConcatenate($perl_home,"5.8.9","i686-linux-thread-multi","CORE")); 582 582 } 583 583 } … … 587 587 # is from SVN, the user must have their own Perl and put it on the PATH or set 588 588 # perlpath in the gsdl site config file. 589 $perl_bin_dir = & util::filename_cat($gsdlhome, "bin", "windows", "perl", "bin");589 $perl_bin_dir = &FileUtils::filenameConcatenate($gsdlhome, "bin", "windows", "perl", "bin"); 590 590 if(-e $perl_bin_dir) { 591 591 &util::envvar_append("PATH", $perl_bin_dir); … … 606 606 my @ext_homes = (); 607 607 608 my $gsdl_ext_home = & util::filename_cat($gsdlhome,"ext");608 my $gsdl_ext_home = &FileUtils::filenameConcatenate($gsdlhome,"ext"); 609 609 push(@ext_homes,$gsdl_ext_home); 610 610 611 611 if ($self->{'greenstone_version'} == 3) { 612 612 my $gsdl3srchome = $self->get_gsdl3_src_home(); 613 my $gsdl3_ext_home = & util::filename_cat($gsdl3srchome,"ext");613 my $gsdl3_ext_home = &FileUtils::filenameConcatenate($gsdl3srchome,"ext"); 614 614 push(@ext_homes,$gsdl3_ext_home); 615 615 } … … 624 624 625 625 foreach my $ed (@pot_ext_dir) { 626 my $full_ext_dir = & util::filename_cat($ext_home,$ed);626 my $full_ext_dir = &FileUtils::filenameConcatenate($ext_home,$ed); 627 627 628 628 if (-d $full_ext_dir) { 629 629 630 my $full_ext_perllib_dir = & util::filename_cat($full_ext_dir,"perllib");630 my $full_ext_perllib_dir = &FileUtils::filenameConcatenate($full_ext_dir,"perllib"); 631 631 if (-d $full_ext_perllib_dir) { 632 632 unshift (@INC, $full_ext_perllib_dir); 633 633 } 634 634 635 my $full_inc_file = & util::filename_cat($full_ext_dir,635 my $full_inc_file = &FileUtils::filenameConcatenate($full_ext_dir, 636 636 "$ed-setup.pl"); 637 637 if (-f $full_inc_file) { … … 677 677 if($self->{'greenstone_version'} == 2 && defined $ENV{'GSDLHOME'}) { 678 678 if(defined $collection) { 679 $collection_directory = & util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection);679 $collection_directory = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect", $collection); 680 680 } else { 681 $collection_directory = & util::filename_cat($ENV{'GSDLHOME'}, "collect");681 $collection_directory = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "collect"); 682 682 } 683 683 } … … 685 685 if(defined $ENV{'GSDL3HOME'}) { 686 686 if(defined $collection) { 687 $collection_directory = & util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect", $collection);687 $collection_directory = &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'}, "sites", $site, "collect", $collection); 688 688 } else { 689 $collection_directory = & util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect");689 $collection_directory = &FileUtils::filenameConcatenate($ENV{'GSDL3HOME'}, "sites", $site, "collect"); 690 690 } 691 691 } 692 692 elsif(defined $ENV{'GSDL3SRCHOME'}) { 693 693 if(defined $collection) { 694 $collection_directory = & util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect", $collection);694 $collection_directory = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect", $collection); 695 695 } else { 696 $collection_directory = & util::filename_cat($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect");696 $collection_directory = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'}, "web", "sites", $site, "collect"); 697 697 } 698 698 } … … 707 707 708 708 my $prefix_dir = getcwd(); 709 my $full_path = & util::filename_cat($prefix_dir,$local_dir);709 my $full_path = &FileUtils::filenameConcatenate($prefix_dir,$local_dir); 710 710 711 711 if ($prefix_dir !~ m/collect/) { … … 718 718 } 719 719 720 & util::rm_r($full_path);720 &FileUtils::removeFilesRecursive($full_path); 721 721 } 722 722 … … 728 728 my $java_home = $ENV{'JAVA_HOME'}; 729 729 $java_home =~ s/\/$//; # Remove trailing slash if present (Unix specific) 730 return & util::filename_cat($java_home, "bin", "java");730 return &FileUtils::filenameConcatenate($java_home, "bin", "java"); 731 731 } 732 732 … … 794 794 795 795 my $java = get_java_path(); 796 my $java_gsdl3_classpath = & util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar");797 my $java_remaining_classpath = & util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "*"); # log4j etc796 my $java_gsdl3_classpath = &FileUtils::filenameConcatenate($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar"); 797 my $java_remaining_classpath = &FileUtils::filenameConcatenate($gsdl3srchome, "web", "WEB-INF", "lib", "*"); # log4j etc 798 798 my $java_classpath; 799 799 my $gsdlos = $ENV{'GSDLOS'};
Note:
See TracChangeset
for help on using the changeset viewer.