Changeset 14325

Timestamp:

2007-08-07T09:33:55+12:00 (17 years ago)

Author:

qq6

Message:

updated gliserver4gs3.pl

File:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver4gs3.pl (modified) (6 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gliserver4gs3.pl

@@ -1 @@
-#!/perl -w
+#!/usr/bin/perl -w
 # Need to specify the full path of Perl above
-#print STDOUT "Content-type:text/plain\n\n";
+
+#print "Content-type: text/html\n\n";
 
 &main;
@@ -8 +9 @@
 use strict;
 
+#my $authentication_enabled = 0;
 my $debugging_enabled = 1;
 
@@ -146 +148 @@
     my $java_gsdl3_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "gsdl3.jar");
     my $java_derby_classpath = &util::filename_cat($gsdl3srchome, "web", "WEB-INF", "lib", "derby.jar");
-    my $java_classpath="classes/:" . $java_gsdl3_classpath . ":" . $java_derby_classpath;
-   
+    my $java_classpath;
+    my $gsdlos = $ENV{'GSDLOS'};
+    if ($gsdlos !~ /windows/){
+    $java_classpath = $java_gsdl3_classpath . ":" . $java_derby_classpath;
+    }else{
+    $java_classpath = $java_gsdl3_classpath . ";" . $java_derby_classpath;
+    }
     my $java_args = &util::filename_cat($gsdl3srchome, "web", "sites", $site, "etc", "usersDB");
     my $java_command="$java -classpath \"$java_classpath\" org.greenstone.gsdl3.util.DerbyWrapper \"$java_args\" 2>&1";
@@ -272 +279 @@
     my $java_status = $?;
     print "<pre>";
+    print "===============" ;
     print "$java_output";
     print "</pre>";
@@ -356 +364 @@
 
     # Ensure the user is allowed to edit this collection
-    #&authenticate_user($gsdl_cgi, $username, $collection, $site);
+    &authenticate_user($gsdl_cgi, $username, $collection, $site);
 
     my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};
@@ -920 +928 @@
 
     # Ensure the user is allowed to edit this collection
-    &authenticate_user($gsdl_cgi, $username, $collection, $site);
+    #&authenticate_user($gsdl_cgi, $username, $collection, $site);
 
     my $gsdl3srchome = $ENV{'GSDL3SRCHOME'};