Changeset 22508

Timestamp:

2010-07-26T15:44:03+12:00 (14 years ago)

Author:

kjdon

Message:

some moving around and tidying up of code

File:

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

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

@@ -35 +35 @@
 use gsprintf 'gsprintf';
 
+# these two variables mustn't be initialised here or they will get stuck 
+# at those values.
+our $openoffice_conversion_available; 
+our $no_openoffice_conversion_reason; 
+
 BEGIN {
     @OpenOfficeConverter::ISA = ('ConvertBinaryFile', 'BaseMediaConverter');
-}
-
-my $arguments = [ ];
-
-my $opt_arguments = [
-    { 'name' => "openoffice_port",
-      'desc' => "{OpenOfficeConverter.openoffice_port}",
-      'type' => "int",
-      'deft' => "8100",
-      'range' => "81,",
-      'reqd' => "no" },
-    ];
-
-my $options = { 'name' => "OpenOfficeConverter",
-        'desc' => "{OpenOfficeConverter.desc}",
-        'abstract' => "yes",
-        'inherits' => "yes",
-        'args' => $arguments };
-
-sub new {
-    my ($class) = shift (@_);
-    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
-    push(@$pluginlist, $class);
-
 
     # Check that OpenOffice and jodconverter are installed and available on 
     # the path 
 
-    my $openoffice_conversion_available = 1;
-    my $no_openoffice_conversion_reason = "";
+    $openoffice_conversion_available = 1;
+    $no_openoffice_conversion_reason = "";
     
     if (! defined $ENV{'GEXT_OPENOFFICE'}) {
@@ -91 +72 @@
         }
         }
-
         my $cmd = "soffice -headless 2>&1";
 
@@ -104 +84 @@
     }
 
-    if ($openoffice_conversion_available) {
-    push(@$arguments,@$opt_arguments);
-    }
+}
+
+my $arguments = [
+    { 'name' => "openoffice_port",
+      'desc' => "{OpenOfficeConverter.openoffice_port}",
+      'type' => "int",
+      'deft' => "8100",
+      'range' => "81,",
+      'reqd' => "no" },
+    ];
+
+my $options = { 'name' => "OpenOfficeConverter",
+        'desc' => "{OpenOfficeConverter.desc}",
+        'abstract' => "yes",
+        'inherits' => "yes",
+        'args' => $arguments };
+
+sub new {
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
 
     push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
@@ -113 +111 @@
     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);
 
+    if ($self->{'info_only'}) {
+    # don't worry about any options etc
+    return bless $self, $class;
+    }
     if ($openoffice_conversion_available) {
     my $oo_port = $self->{'openoffice_port'};
@@ -129 +130 @@
     my $outhandle = $self->{'outhandle'};
     &gsprintf($outhandle, "OpenOfficeConverter: {OpenOfficeConverter.noconversionavailable} ({OpenOfficeConverter.$no_openoffice_conversion_reason})\n");
+    &gsprintf($outhandle, "OpenOfficeConverter {OpenOfficeConverter.ConvertBinaryFileDefault}\n");
     }