Changeset 11114 for trunk/gsdl

Timestamp:

2006-01-26T15:26:04+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added the UnixCrypt.pm file into perllib/cpan/Crypt, and changed gliserver.pl to look for it there.

File:

• trunk/gsdl/cgi-bin/gliserver.pl (modified) (3 diffs)

trunk/gsdl/cgi-bin/gliserver.pl

@@ -3 +3 @@
 
 use gsdlCGI;
-
-# The version of Perl distributed with Greenstone on Windows doesn't have crypt, so use this instead
-use Crypt::UnixCrypt;
 
 
@@ -21 +18 @@
     my $gsdl_cgi = new gsdlCGI("+cmdline");
 
+    # Load the Greenstone modules that we need to use
+    $gsdl_cgi->setup_gsdl();
+    my $gsdlhome = $ENV{'GSDLHOME'};
+    $gsdl_cgi->checked_chdir($gsdlhome);
+    require "$gsdlhome/perllib/util.pm";  # This is OK on Windows
+    require "$gsdlhome/perllib/cpan/Crypt/UnixCrypt.pm";  # This is OK on Windows
+
     # Encrypt the password
     if (defined $gsdl_cgi->param("pw")) {
@@ -27 +31 @@
 
     $gsdl_cgi->parse_cgi_args();
-    $gsdl_cgi->setup_gsdl();
-
-    my $gsdlhome = $ENV{'GSDLHOME'};
-    $gsdl_cgi->checked_chdir($gsdlhome);
-    require "$gsdlhome/perllib/util.pm";  # This is OK on Windows
 
     my $cmd = $gsdl_cgi->clean_param("cmd");