Changeset 23732 for main

Timestamp:

2011-02-22T21:43:16+13:00 (13 years ago)

Author:

ak19

Message:

Second (final) part of changes for getting OpenOffice conversion to work on a remote WINDOWS Greenstone (Linux was working already).

Location:

main/trunk/greenstone2

Files:

• cgi-bin/gsdlCGI.pm (modified) (2 diffs)
• cgi-bin/gsdlsite.cfg.in (modified) (1 diff)
• runtime-src/packages/apache-httpd/windows-httpd.conf.in (modified) (1 diff)

main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

@@ -447 +447 @@
 }
 
+# sets optional customisable values to do with Open Office
+sub setup_openoffice {
+    my $self = shift @_;
+    my ($optional) = @_;
+
+    if (!defined $self->{'soffice_home'}) # Don't need to go through it all again if we'd already done this before
+    {
+    # First look in the gsdlsite.cfg file for the openoffice properties to be defined
+    $self->{'soffice_home'} = $self->get_config_info("soffice_home", $optional);
+    $self->{'soffice_host'} = $self->get_config_info("soffice_host", $optional);
+    $self->{'soffice_port'} = $self->get_config_info("soffice_port", $optional);
+    
+    if (defined $self->{'soffice_home'}) {
+        $ENV{'SOFFICE_HOME'} = $self->{'soffice_home'}; 
+    }   
+    if (defined $self->{'soffice_host'}) {
+        $ENV{'SOFFICE_HOST'} = $self->{'soffice_host'}; 
+    }
+    if (defined $self->{'soffice_port'}) {
+        $ENV{'SOFFICE_PORT'} = $self->{'soffice_port'}; 
+    }
+    }
+}
+
 sub setup_gsdl {
     my $self = shift @_;
@@ -597 +621 @@
     # FEDORA_HOME and FEDORA_VERSION are needed (by scripts g2f-import and g2f-buildcol).
     $self->setup_fedora_homes($optional);
+
+
+    # Check for any customisations to Open-Office if on Windows
+    if ($gsdlos eq "windows") {
+    $self->setup_openoffice($optional);
+    }
 }
 

main/trunk/greenstone2/cgi-bin/gsdlsite.cfg.in

@@ -58 +58 @@
 #javahome /full/path/to/j2sdk1.4-or-higher
 
+# Options for Open Office (used in converting Office documents)
+
+# If using Open Office on Windows, then you can optionally customise the 
+# following properties (defaults are as shown). E.g. if Open Office is not 
+# located in C:\Program Files\OpenOffice.org 3\program, then you'll want 
+# to provide its new path by specifying soffice_home.
+#soffice_home "C:\Program Files\OpenOffice.org 3\program"
+#soffice_host 127.0.0.1
+#soffice_port 8200
+
+# Leave an empty line at the end

main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

@@ -45 +45 @@
 #Listen 12.34.56.78:80
 Listen **PORT**
+
+# http://httpd.apache.org/docs/1.3/mod/mod_env.html#passenv 
+# For a remote greenstone server on Windows, need to have access to the
+# USERPROFILE environment variable in order for open-office to process docs
+# It also requires ProgramFiles to guess where the OpenOffice bin is installed
+PassEnv "USERPROFILE" "ProgramFiles" LANG
 
 #