Changeset 23756 for main

Timestamp:

2011-03-02T16:08:54+13:00 (13 years ago)

Author:

davidb

Message:

Two adjustments to this file: 1) printing the OK message is now always done as 'text/plain' regardless of whether Greenstone 2 or 3. The latter used to be printed out in HTML form, and I see no real reason for this. 2) adding in 'bin' and 'lib' folders for ImageMagick changed to prepend, as opposed to append, to be consistent with setup.bat

File:

• main/trunk/greenstone2/cgi-bin/gsdlCGI.pm (modified) (2 diffs)

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

@@ -155 +155 @@
     my $self = shift @_;
     my ($message) = @_;
-    
-    #if($self->{'greenstone_version'} == 2) { # plain text, for IIS 6
-    print STDOUT "Content-type:text/plain\n\n$message";
-    #} else {
-    #print "Content-type:text/html\n\n";
-    #print "<pre>";
-    #print STDOUT $message;
-    #print "</pre>";
-    #}
+
+
+    binmode(STDOUT,":utf8");    
+    print STDOUT "Content-type:text/plain\n\n$message";
 }
 
@@ -531 +526 @@
     my $magick_home = &util::filename_cat($gsdl_bin_os,"imagemagick");
     if(-e $magick_home) {
+    &util::envvar_prepend("PATH", $magick_home);
+
+    # Doesn't look like 'bin' and 'lib' are used for Windows version anymore,
+    # but that might just be one particular installation pattern, and there's
+    # no harm (that I can see) in keeping them in
+
     my $magick_bin = &util::filename_cat($magick_home,"bin");
     my $magick_lib = &util::filename_cat($magick_home,"lib");
 
-    &util::envvar_append("PATH", $magick_bin);
+    &util::envvar_prepend("PATH", $magick_bin);
 
     if(!defined $ENV{'MAGICK_HOME'} || $ENV{'MAGICK_HOME'} eq "") {