Changeset 35453 for gs2-extensions/open-office/trunk

Timestamp:

2021-09-22T17:56:15+12:00 (3 years ago)

Author:

anupama

Message:

Using the newly added util subroutine get_first_existing_dir(list_of_dirs), just committed prior to this, to search through all known default locations where openoffice and libre_office may be installed for the first directory that may exist. This is to further reduce the likelihood of having to set SOFFICE_HOME. Was found necessary on this test machine where LibreOffice instead of OpenOffice is installed and not in the default location of OpenOffice.

Location:

gs2-extensions/open-office/trunk

Files:

• open-office-java.tar.gz (modified) ( previous)
• open-office-java.zip (modified) ( previous)
• src/perllib/plugins/OpenOfficeConverter.pm (modified) (1 diff)

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

@@ -84 +84 @@
         # and open office is on a remote windows machine
         if(!defined $ENV{'SOFFICE_HOME'}) {
-            $ENV{'SOFFICE_HOME'} = &FileUtils::filenameConcatenate($ENV{'ProgramFiles'},"OpenOffice.org 3"); 
+            # check all the favourite haunts of openoffice in turn
+            $ENV{'SOFFICE_HOME'} = &util::get_first_existing_dir(
+                &FileUtils::filenameConcatenate($ENV{'ProgramFiles'},"OpenOffice.org 3"),
+                &FileUtils::filenameConcatenate($ENV{'ProgramFiles(X86)'},"OpenOffice.org 3"),
+                &FileUtils::filenameConcatenate($ENV{'ProgramFiles'},"LibreOffice"),
+                &FileUtils::filenameConcatenate($ENV{'ProgramFiles(X86)'},"LibreOffice")                
+            );
+            
+            # These 2 env vars are diff and appear as expected when printed out in a cmd prompt on a 64 bit Windows. But on same machine
+            # in perl, at least when launched through (Java 32 bit) GLI, their values shown as the same: as "C:\Program Files (x86)"
+            #print STDERR "@@@@ ProgFiles: $ENV{'ProgramFiles'}\n";
+            #print STDERR "@@@@ ProgFiles x86: $ENV{'ProgramFiles(X86)'}\n";
         }
-        my $ooffice_dir_guess =
-            &FileUtils::filenameConcatenate($ENV{'SOFFICE_HOME'},"program");
-        if (-d  $ooffice_dir_guess) {
-            &util::envvar_append("PATH",$ooffice_dir_guess);
+        if(defined $ENV{'SOFFICE_HOME'}) {
+            #print STDERR "@@@@ Found $ENV{'SOFFICE_HOME'}\n";
+            my $ooffice_dir_guess =
+                &FileUtils::filenameConcatenate($ENV{'SOFFICE_HOME'},"program");
+            if (-d  $ooffice_dir_guess) {
+                &util::envvar_append("PATH",$ooffice_dir_guess);
+            }
         }
-
+        
         # for windows, when working on a remote system, want to be able to start OO if
         # not already running. We'll use the uno socket method to do so. Else client-gli