Changeset 22704 for gs2-extensions/open-office-src

Timestamp:

2010-08-21T23:27:41+12:00 (14 years ago)

Author:

davidb

Message:

Tidied up printing of command run to conditionally displayed based on verbosity level

File:

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

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

@@ -84 +84 @@
 }
 
-#my $arguments = [
-#    { 'name' => "openoffice_port",
-#      'desc' => "{OpenOfficeConverter.openoffice_port}",
-#      'type' => "int",
-#      'deft' => "8100",
-#      'range' => "81,",
-#      'reqd' => "no" },
-#    ];
-
-my $arguments = [ ];
+my $arguments = [
+    { 'name' => "openoffice_port",
+      'desc' => "{OpenOfficeConverter.openoffice_port}",
+      'type' => "int",
+      'deft' => "8100",
+      'range' => "81,",
+      'reqd' => "no" },
+    ];
 
 
@@ -117 +115 @@
     return bless $self, $class;
     }
+    if (!$openoffice_conversion_available) {
+    $self->{'no_openoffice_conversion_reason'} = $no_openoffice_conversion_reason;
+
+    my $outhandle = $self->{'outhandle'};
+    &gsprintf($outhandle, "OpenOfficeConverter: {OpenOfficeConverter.noconversionavailable} ({OpenOfficeConverter.$no_openoffice_conversion_reason})\n");
+    }  
+
+    $self->{'openoffice_conversion_available'} = $openoffice_conversion_available;
+    
+    return bless $self, $class;
+
+}
+
+sub init {
+    my $self = shift(@_);
+    my ($verbosity, $outhandle, $failhandle) = @_;
+
     if ($openoffice_conversion_available) {
-    # my $oo_port = $self->{'openoffice_port'};
-    my $oo_port = 8100;
+    my $oo_port = $self->{'openoffice_port'};
 
     my $launch_cmd = "soffice";
     $launch_cmd .= " \"-accept=socket,host=localhost,port=$oo_port;urp;StarOffice.ServiceManager\"";
     $launch_cmd .= " -headless";
-    
     $self->{'openoffice_launch_cmd'} = $launch_cmd;
     }
-    else {       
-    $self->{'no_openoffice_conversion_reason'} = $no_openoffice_conversion_reason;
-
-    my $outhandle = $self->{'outhandle'};
-    &gsprintf($outhandle, "OpenOfficeConverter: {OpenOfficeConverter.noconversionavailable} ({OpenOfficeConverter.$no_openoffice_conversion_reason})\n");
-    }  
-
-    $self->{'openoffice_conversion_available'} = $openoffice_conversion_available;
-    
-    return bless $self, $class;
-
-}
-
-sub init {
-    my $self = shift(@_);
-    my ($verbosity, $outhandle, $failhandle) = @_;
 
     $self->{'ootmp_file_paths'} = ();
@@ -161 +158 @@
     # check the filename
     return 0 if ( !-f $source_file_full_path);
+
+    my $outhandle = $self->{'outhandle'};
+    my $verbosity = $self->{'verbosity'};
 
     my $source_file_no_path = &File::Basename::basename($source_file_full_path);
@@ -181 +181 @@
     # Generate and run the convert command
     my $convert_command = "oo2html \"$source_file_full_path\" \"$target_file_path\"";
-    print STDERR "convert_command = $convert_command\n";
+    if ($verbosity>2) {
+    print $outhandle "Convert command: $convert_command\n";
+    }
+
     my $print_info = { 'message_prefix' => "OpenOffice Conversion",
                'message' => "Converting $source_file_no_path to: $target_file_type" };