Changeset 16327 for greenstone3

Timestamp:

2008-07-10T11:48:54+12:00 (16 years ago)

Author:

ak19

Message:

Minor changes to better work with Windows (preview url/libraryUrlSuffix is library.exe for GS2 server).

File:

• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) (4 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm

@@ -327 +327 @@
         $library_url = $self->get_config_info("httpprefix");
         $library_url = "$library_url/cgi-bin/library";
+
+        my $gsdlos = (defined $ENV{'GSDLOS'}) ? $ENV{'GSDLOS'} : $self->get_gsdl_os();
+        if($gsdlos =~ /windows/) { # remote GS2 server on Windows uses "library.exe"
+        $library_url .= ".exe";
+        }
     } 
     else { # greenstone 3 or later and gwcgi not defined
@@ -341 +346 @@
     my $gsdlhome = $self->get_gsdl_home();
     my $gsdlos = $self->get_gsdl_os();
-    my $library_url = $self->get_library_url_suffix();
-
     $ENV{'GSDLHOME'} = $gsdlhome;
     $ENV{'GSDLOS'} = $gsdlos;
+
+    my $library_url = $self->get_library_url_suffix(); # best to have GSDLOS set beforehand
     $self->{'library_url_suffix'} = $library_url;
     
     if($self->{'greenstone_version'} == 3) {
     my $gsdl3srchome = $self->get_gsdl3_src_home();
-    my $javahome = $self->get_java_home();
-    
     $ENV{'GSDL3SRCHOME'} = $gsdl3srchome;   
-    $ENV{'JAVA_HOME'} = $javahome;  
     } 
 
@@ -362 +364 @@
     my $gsdl_bin_os = &util::filename_cat($gsdlhome,"bin",$gsdlos);
     &util::envvar_append("PATH",$gsdl_bin_os);
-
+    
+    # Perl comes installed with the GS Windows Release Kit. 
+    # However, if GS is from SVN, the user must have their own Perl and put it on the path.
+    my $perl_bin_dir; # undefined
     if ($gsdlos eq "windows") {
-    my $gsdl_perl_bin_directory = &util::filename_cat($gsdlhome, "bin", "windows", "perl", "bin");
-    &util::envvar_append("PATH", $gsdl_perl_bin_directory);
-    }
-    elsif($self->{'greenstone_version'} == 3) { # and it's on linux now
-    my $perlpath = $self->get_perl_path();
-    &util::envvar_append("PATH", $perlpath);
-    }
+    $perl_bin_dir = &util::filename_cat($gsdlhome, "bin", "windows", "perl", "bin");
+    if(-e $perl_bin_dir) {
+        &util::envvar_append("PATH", $perl_bin_dir);
+    }
+    }
+    
+    # Uncomment these lines if you want to read the "javahome" and "perlpath" properties 
+    # from values you have set in the gsdl(3)site.cfg config file
+    #my $javahome = $self->get_java_home(); 
+    #$ENV{'JAVA_HOME'} = $javahome;
+    #if(!defined $perl_bin_dir) {
+    #$perl_bin_dir = $self->get_perl_path();
+    #&util::envvar_append("PATH", $perl_bin_dir);
+    #}
 }
 
@@ -413 +425 @@
 
     my $prefix_dir = getcwd(); 
-    my $full_dir = &util::filename_cat($prefix_dir,$local_dir);
+    my $full_path = &util::filename_cat($prefix_dir,$local_dir);
     
     if ($prefix_dir !~ m/collect/) {
-    $self->generate_error("Trying to delete outside of Greenstone collect: $full_dir");
+    $self->generate_error("Trying to delete outside of Greenstone collect: $full_path");
     }
 
     # Delete recursively
-    if (!-e $full_dir) {
-    $self->generate_error("File/Directory does not exist: $full_dir");
-    }
-
-    &util::rm_r($full_dir);
+    if (!-e $full_path) {
+    $self->generate_error("File/Directory does not exist: $full_path");
+    }
+
+    &util::rm_r($full_path);
 }