Changeset 22609 for gs2-extensions

Timestamp:

2010-08-12T15:55:23+12:00 (14 years ago)

Author:

kjdon

Message:

now just inherits from BaseMediaConverter not ConvertBinaryFile. A new convert method, which is used by OpenOfficePlugin and other plugins that use this.

File:

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

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

@@ -41 +41 @@
 
 BEGIN {
-    @OpenOfficeConverter::ISA = ('ConvertBinaryFile', 'BaseMediaConverter');
+    @OpenOfficeConverter::ISA = ('BaseMediaConverter');
 
     # Check that OpenOffice and jodconverter are installed and available on 
     # the path 
-
     $openoffice_conversion_available = 1;
     $no_openoffice_conversion_reason = "";
@@ -55 +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,"lib","java","jodconverterx.jar");
 
     if (!-e $jodjar) {
@@ -109 +108 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $bmc_self = new BaseMediaConverter($pluginlist, $inputargs, $hashArgOptLists,1);
-    my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
-    my $self = BasePlugin::merge_inheritance($bmc_self,$cbf_self);
+    my $self = new BaseMediaConverter($pluginlist, $inputargs, $hashArgOptLists);
 
     if ($self->{'info_only'}) {
@@ -130 +127 @@
     my $outhandle = $self->{'outhandle'};
     &gsprintf($outhandle, "OpenOfficeConverter: {OpenOfficeConverter.noconversionavailable} ({OpenOfficeConverter.$no_openoffice_conversion_reason})\n");
-    &gsprintf($outhandle, "OpenOfficeConverter {OpenOfficeConverter.ConvertBinaryFileDefault}\n");
     }  
 
@@ -143 +139 @@
     my ($verbosity, $outhandle, $failhandle) = @_;
 
-    $self->ConvertBinaryFile::init($verbosity,$outhandle,$failhandle);
- 
     $self->{'ootmp_file_paths'} = ();
 }
@@ -151 +145 @@
     my $self = shift(@_);
 
-    $self->ConvertBinaryFile::deinit(@_);
- 
     $self->clean_up_temporary_files();
 }
 
 
-    
-
 sub convert {
+    my $self = shift(@_);
+    my ($source_file_full_path, $target_file_type) = @_;
+
+    return 0 unless $openoffice_conversion_available;
+    # check the filename
+    return 0 if ( !-f $source_file_full_path);
+
+    my $source_file_no_path = &File::Basename::basename($source_file_full_path);
+    # Determine the full name and path of the output file
+    my $target_file_path;
+    if ($self->{'enable_cache'}) {
+    $self->init_cache_for_file($source_file_full_path);
+    my $cache_dir = $self->{'cached_dir'};
+    my $file_root = $self->{'cached_file_root'};
+    #$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);
+    }
+    else {
+    # this is in gsdl/tmp. get a tmp filename in collection instead???
+    $target_file_path = &util::get_tmp_filename($target_file_type);
+    push(@{$self->{'ootmp_file_paths'}}, $target_file_path);
+    }
+
+    # Generate and run the convert command
+    my $convert_command = "oo2html \"$source_file_full_path\" \"$target_file_path\"";
+    print STDERR "convert_command = $convert_command\n";
+    my $print_info = { 'message_prefix' => "OpenOffice Conversion",
+               'message' => "Converting $source_file_no_path to: $target_file_type" };
+    #$print_info->{'cache_mode'} = $cache_mode if ($cache_mode ne "");
+
+    my ($regenerated,$result,$had_error) 
+    = $self->autorun_general_cmd($convert_command,$source_file_full_path, $target_file_path,$print_info);
+    if ($had_error) {
+    return (0, $result,$target_file_path);
+    }
+    return (1, $result,$target_file_path);
+}
+
+
+
+sub convert_orig {
     my $self = shift(@_);
     my $source_file_path = shift(@_);