Changeset 35233

Timestamp:

2021-07-27T17:12:00+12:00 (3 years ago)

Author:

anupama

Message:

Extending changes of commits 35213-35215 as they broke diffcol on Linux (yet strangely not on Windows): diffcol exports empty GSDL3SRCHOME (and GSDLHOME) variable. This ends up as defined but with no value. After commit revisions 35213-35215 the import, buildcol (and activate) scripts test whether these variables are defined (which they are even for GS2 when diffcol runs) and then sets the site variable to localsite. Need to test these variables aren't just defined but also not empty string before setting site to localsite, in order for diffcol testing, which runs on GS2 installs, to still work.

Location:

main/trunk/greenstone2/bin/script

Files:

• activate.pl (modified) (1 diff)
• buildcol.pl (modified) (1 diff)
• import.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/activate.pl

@@ -186 +186 @@
 
     ## shortcut - if gsdl3srchome is set, and site is not set, set site to localsite
-    if (defined $ENV{'GSDL3SRCHOME'}) {
+    ## But need to check gsdl3srchome not empty even if defined, as that can
+    ## happen when nightly diffcol is run and doesn't mean it's a GS3 install
+    if (defined $ENV{'GSDL3SRCHOME'} && $ENV{'GSDL3SRCHOME'} ne "") {
         if (!defined $site || $site eq "") {
         $site = "localsite";

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -357 +357 @@
 
         ## shortcut - if gsdl3srchome is set, and site is not set, set site to localsite
-        if (defined $ENV{'GSDL3SRCHOME'}) {
+    ## But need to check gsdl3srchome not empty even if defined, as that can
+    ## happen when nightly diffcol is run and doesn't mean it's a GS3 install
+    if (defined $ENV{'GSDL3SRCHOME'} && $ENV{'GSDL3SRCHOME'} ne "") {
             if (!defined $buildcolutils->{'site'} || $buildcolutils->{'site'} eq "") {
                 $buildcolutils->{'site'} = "localsite";

main/trunk/greenstone2/bin/script/import.pl

@@ -229 +229 @@
     
     ## shortcut - if gsdl3srchome is set, and site is not set, set site to localsite
-    if (defined $ENV{'GSDL3SRCHOME'}) {
+    ## But need to check gsdl3srchome not empty even if defined, as that can
+    ## happen when nightly diffcol is run and doesn't mean it's a GS3 install
+    if (defined $ENV{'GSDL3SRCHOME'} && $ENV{'GSDL3SRCHOME'} ne "") {
         if (!defined $inexport->{'site'} || $inexport->{'site'} eq "") {
         $inexport->{'site'} = "localsite";