Changeset 14325

Show
Ignore:
Timestamp:
07.08.2007 09:33:55 (12 years ago)
Author:
qq6
Message:

updated gliserver4gs3.pl

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/web/WEB-INF/cgi/gliserver4gs3.pl

    r14314 r14325  
    1 #!/perl -w 
     1#!/usr/bin/perl -w 
    22# Need to specify the full path of Perl above 
    3 #print STDOUT "Content-type:text/plain\n\n"; 
     3 
     4#print "Content-type: text/html\n\n"; 
    45 
    56&main; 
     
    89use strict; 
    910 
     11#my $authentication_enabled = 0; 
    1012my $debugging_enabled = 1; 
    1113 
     
    146148    my $java_gsdl3_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar"); 
    147149    my $java_derby_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "derby.jar"); 
    148     my $java_classpath="classes/:" . $java_gsdl3_classpath . ":" . $java_derby_classpath; 
    149     
     150    my $java_classpath; 
     151    my $gsdlos = $ENV{'GSDLOS'}; 
     152    if ($gsdlos !~ /windows/){ 
     153    $java_classpath = $java_gsdl3_classpath . ":" . $java_derby_classpath; 
     154    }else{ 
     155    $java_classpath = $java_gsdl3_classpath . ";" . $java_derby_classpath; 
     156    } 
    150157    my $java_args = &util::filename_cat($gsdl3srchome, "web", "sites", $site, "etc", "usersDB"); 
    151158    my $java_command="$java -classpath \"$java_classpath\" org.greenstone.gsdl3.util.DerbyWrapper \"$java_args\" 2>&1"; 
     
    272279    my $java_status = $?; 
    273280    print "<pre>"; 
     281    print "===============" ; 
    274282    print "$java_output"; 
    275283    print "</pre>"; 
     
    356364 
    357365    # Ensure the user is allowed to edit this collection 
    358     #&authenticate_user($gsdl_cgi, $username, $collection, $site); 
     366    &authenticate_user($gsdl_cgi, $username, $collection, $site); 
    359367 
    360368    my $gsdl3srchome = $ENV{'GSDL3SRCHOME'}; 
     
    920928 
    921929    # Ensure the user is allowed to edit this collection 
    922     &authenticate_user($gsdl_cgi, $username, $collection, $site); 
     930    #&authenticate_user($gsdl_cgi, $username, $collection, $site); 
    923931 
    924932    my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};