Changeset 28335

Show
Ignore:
Timestamp:
01.10.2013 16:07:24 (6 years ago)
Author:
ak19
Message:

Replaced deprecated util:: functions with FileUtils:: equivalents

Location:
gs2-extensions/open-office/trunk/src/perllib/plugins
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm

    r25334 r28335  
    5454    else { 
    5555    my $gextoo_home = $ENV{'GEXT_OPENOFFICE'}; 
    56     #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar"); 
    57     my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 
     56    #my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"lib","java","jodconverter.jar"); 
     57    my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 
    5858 
    5959    if (!-e $jodjar) { 
     
    8484        # and open office is on a remote windows machine 
    8585        if(!defined $ENV{'SOFFICE_HOME'}) { 
    86             $ENV{'SOFFICE_HOME'} = &util::filename_cat($ENV{'ProgramFiles'},"OpenOffice.org 3");  
     86            $ENV{'SOFFICE_HOME'} = &FileUtils::filenameConcatenate($ENV{'ProgramFiles'},"OpenOffice.org 3");  
    8787        } 
    8888        my $ooffice_dir_guess = 
    89             &util::filename_cat($ENV{'SOFFICE_HOME'},"program"); 
     89            &FileUtils::filenameConcatenate($ENV{'SOFFICE_HOME'},"program"); 
    9090        if (-d  $ooffice_dir_guess) { 
    9191            &util::envvar_append("PATH",$ooffice_dir_guess); 
     
    218218    $file_root .= "_$convert_id" if ($convert_id ne ""); 
    219219    my $target_file = "$file_root.$target_file_type"; 
    220     $target_file_path = &util::filename_cat($cache_dir,$target_file); 
     220    $target_file_path = &FileUtils::filenameConcatenate($cache_dir,$target_file); 
    221221    } 
    222222    else { 
     
    228228 
    229229    my $gextoo_home = $ENV{'GEXT_OPENOFFICE'}; 
    230     #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar"); 
    231     my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 
     230    #my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"lib","java","jodconverter.jar"); 
     231    my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 
    232232 
    233233    # debugging: print out all the env vars, when import's verbosity is high 
     
    326326    foreach my $ootmp_file_path (@{$self->{'ootmp_file_paths'}}) { 
    327327    if (-e $ootmp_file_path) { 
    328         &util::rm($ootmp_file_path); 
     328        &FileUtils::removeFiles($ootmp_file_path); 
    329329    } 
    330330    } 
  • gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficePlugin.pm

    r28289 r28335  
    190190     
    191191    # store original file as associated file 
    192     my $filename = &util::filename_cat($base_dir, $file); 
     192    my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 
    193193    my $assocfilename = $doc_obj->get_assocfile_from_sourcefile(); 
    194194    $doc_obj->associate_file($filename, $assocfilename, undef, $cursection); 
     
    223223    # associate original file with doc object 
    224224    my $cursection = $doc_obj->get_top_section(); 
    225     my $filename = &util::filename_cat($base_dir, $file); 
     225    my $filename = &FileUtils::filenameConcatenate($base_dir, $file); 
    226226    my $assocfilename = "doc.$doc_ext"; 
    227227    if ($self->{'keep_original_filename'} == 1) {