Changeset 23236 for main

Timestamp:

2010-10-27T15:22:29+13:00 (13 years ago)

Author:

ak19

Message:

Needed to set up Imagemagick (and GhostScript) for the remote server in parallel to what setup.bash does. Otherwise the client-GLI wasn't able to get the server to, for instnace, generate thumbnails when thumbnail generation was turned on. Thanks to Xiao Hu for bringing this to our notice through the mailing list.

File:

• main/trunk/greenstone2/cgi-bin/gsdlCGI.pm (modified) (1 diff)

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

@@ -473 +473 @@
     &util::envvar_prepend("PATH",$gsdl_bin_os);
     
+    # set up ImageMagick for the remote server in parallel to what setup.bash does
+    my $magick_home = &util::filename_cat($gsdl_bin_os,"imagemagick");
+    if(-e $magick_home) {
+    my $magick_bin = &util::filename_cat($magick_home,"bin");
+    my $magick_lib = &util::filename_cat($magick_home,"lib");
+
+    &util::envvar_append("PATH", $magick_bin);
+
+    if(!defined $ENV{'MAGICK_HOME'} || $ENV{'MAGICK_HOME'} eq "") {
+        $ENV{'MAGICK_HOME'} = $magick_home;
+    }
+    
+    if($gsdlos eq "linux") {
+        &util::envvar_prepend("LD_LIBRARY_PATH", $magick_lib);
+    } elsif ($gsdlos eq "linux") {
+        &util::envvar_prepend("DYLD_LIBRARY_PATH", $magick_lib);
+    }
+
+    }
+
+    # set up GhostScript for the remote server in parallel to what setup.bash does
+    my $ghostscript_home = &util::filename_cat($gsdl_bin_os,"ghostscript");
+    if(-e $ghostscript_home) {
+    my $ghostscript_bin = &util::filename_cat($ghostscript_home,"bin");
+    &util::envvar_prepend("PATH", $ghostscript_bin);
+
+    if(!defined $ENV{'GS_LIB'} || $ENV{'GS_LIB'} eq "") {
+        $ENV{'GS_LIB'} = &util::filename_cat($ghostscript_home,"share","ghostscript","8.63","lib");     
+    }
+    if(!defined $ENV{'GS_FONTPATH'} || $ENV{'GS_FONTPATH'} eq "") {
+        $ENV{'GS_FONTPATH'} = &util::filename_cat($ghostscript_home,"share","ghostscript","8.63","Resource","Font");
+    }
+    }
+
     # If the "perlpath" property is set in the gsdl(3)site.cfg config file, it is
     # prepended to PATH only if the same perl bin dir path is not already on PATH env