Changeset 23756

Show
Ignore:
Timestamp:
02.03.2011 16:08:54 (9 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

    r23734 r23756  
    155155    my $self = shift @_; 
    156156    my ($message) = @_; 
    157      
    158     #if($self->{'greenstone_version'} == 2) { # plain text, for IIS 6 
    159     print STDOUT "Content-type:text/plain\n\n$message"; 
    160     #} else { 
    161     #print "Content-type:text/html\n\n"; 
    162     #print "<pre>"; 
    163     #print STDOUT $message; 
    164     #print "</pre>"; 
    165     #} 
     157 
     158 
     159    binmode(STDOUT,":utf8");     
     160    print STDOUT "Content-type:text/plain\n\n$message"; 
    166161} 
    167162 
     
    531526    my $magick_home = &util::filename_cat($gsdl_bin_os,"imagemagick"); 
    532527    if(-e $magick_home) { 
     528    &util::envvar_prepend("PATH", $magick_home); 
     529 
     530    # Doesn't look like 'bin' and 'lib' are used for Windows version anymore, 
     531    # but that might just be one particular installation pattern, and there's 
     532    # no harm (that I can see) in keeping them in 
     533 
    533534    my $magick_bin = &util::filename_cat($magick_home,"bin"); 
    534535    my $magick_lib = &util::filename_cat($magick_home,"lib"); 
    535536 
    536     &util::envvar_append("PATH", $magick_bin); 
     537    &util::envvar_prepend("PATH", $magick_bin); 
    537538 
    538539    if(!defined $ENV{'MAGICK_HOME'} || $ENV{'MAGICK_HOME'} eq "") {