Changeset 28335 for gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm

Timestamp:

2013-10-01T16:07:24+13:00 (11 years ago)

Author:

ak19

Message:

Replaced deprecated util:: functions with FileUtils:: equivalents

File:

• gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm (modified) (5 diffs)

gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm

@@ -54 +54 @@
     else {
     my $gextoo_home = $ENV{'GEXT_OPENOFFICE'};
-    #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
-    my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");
+    #my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"lib","java","jodconverter.jar");
+    my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");
 
     if (!-e $jodjar) {
@@ -84 +84 @@
         # and open office is on a remote windows machine
         if(!defined $ENV{'SOFFICE_HOME'}) {
-            $ENV{'SOFFICE_HOME'} = &util::filename_cat($ENV{'ProgramFiles'},"OpenOffice.org 3"); 
+            $ENV{'SOFFICE_HOME'} = &FileUtils::filenameConcatenate($ENV{'ProgramFiles'},"OpenOffice.org 3"); 
         }
         my $ooffice_dir_guess =
-            &util::filename_cat($ENV{'SOFFICE_HOME'},"program");
+            &FileUtils::filenameConcatenate($ENV{'SOFFICE_HOME'},"program");
         if (-d  $ooffice_dir_guess) {
             &util::envvar_append("PATH",$ooffice_dir_guess);
@@ -218 +218 @@
     $file_root .= "_$convert_id" if ($convert_id ne "");
     my $target_file = "$file_root.$target_file_type";
-    $target_file_path = &util::filename_cat($cache_dir,$target_file);
+    $target_file_path = &FileUtils::filenameConcatenate($cache_dir,$target_file);
     }
     else {
@@ -228 +228 @@
 
     my $gextoo_home = $ENV{'GEXT_OPENOFFICE'};
-    #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
-    my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");
+    #my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"lib","java","jodconverter.jar");
+    my $jodjar = &FileUtils::filenameConcatenate($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");
 
     # debugging: print out all the env vars, when import's verbosity is high
@@ -326 +326 @@
     foreach my $ootmp_file_path (@{$self->{'ootmp_file_paths'}}) {
     if (-e $ootmp_file_path) {
-        &util::rm($ootmp_file_path);
+        &FileUtils::removeFiles($ootmp_file_path);
     }
     }