Changeset 27510 for gs2-extensions/pdf-box/trunk/java

Timestamp:

2013-05-29T21:08:13+12:00 (11 years ago)

Author:

ak19

Message:

Using the recommended FileUtils.pm methods in place of the deprecated utils.pm methods.

File:

• gs2-extensions/pdf-box/trunk/java/perllib/plugins/PDFBoxConverter.pm (modified) (6 diffs)

gs2-extensions/pdf-box/trunk/java/perllib/plugins/PDFBoxConverter.pm

@@ -52 +52 @@
     else {
     my $gextpb_home = $ENV{'GEXT_PDFBOX'};
-    my $pbajar = &util::filename_cat($gextpb_home,"lib","java","pdfbox-app.jar");
+    my $pbajar = &FileUtils::filenameConcatenate($gextpb_home,"lib","java","pdfbox-app.jar");
 
     if (!-e $pbajar) {
@@ -122 +122 @@
     if ($pdfbox_conversion_available) {
     my $gextpb_home = $ENV{'GEXT_PDFBOX'};
-    my $pbajar = &util::filename_cat($gextpb_home,"lib","java","pdfbox-app.jar");
+    my $pbajar = &FileUtils::filenameConcatenate($gextpb_home,"lib","java","pdfbox-app.jar");
     my $java = &util::get_java_command();
     my $launch_cmd = "$java -cp \"$pbajar\" -Dline.separator=\"<br />\" org.apache.pdfbox.ExtractText";
@@ -196 +196 @@
     my $target_file = $img_output_mode ? "$file_root" : "$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 {
@@ -206 +206 @@
     if($img_output_mode) {
         $target_file_path =~ s/\.[^.]*$//g;
-        if(!&util::dir_exists($target_file_path)) {     
+        if(!&FileUtils::directoryExists($target_file_path)) {       
         mkdir($target_file_path);
         }
@@ -227 +227 @@
 
     if($img_output_mode) { # converting to images
-    my $output_prefix = &util::filename_cat($target_file_path, $tailname);
+    my $output_prefix = &FileUtils::filenameConcatenate($target_file_path, $tailname);
     
     $convert_cmd = $self->{'pdfbox_img_launch_cmd'};
@@ -282 +282 @@
     if (-d $pbtmp_file_path) {
         #print STDERR "@@@@@@ cleanup called on $pbtmp_file_path\n";
-        &util::rm_r($pbtmp_file_path);
+        &FileUtils::removeFilesRecursive($pbtmp_file_path);
     }
     elsif (-e $pbtmp_file_path) {
-        &util::rm($pbtmp_file_path);
+        &FileUtils::removeFiles($pbtmp_file_path);
     }
     }