Changeset 16414

Show
Ignore:
Timestamp:
15.07.2008 16:01:46 (12 years ago)
Author:
ak19
Message:

Slightly better way of dealing with GSDL3HOME not being set in the remote case, yet where it can still be declared as being in a separate location as GSDL3SRCHOME in the local GS3 case.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

    r16411 r16414  
    524524    { 
    525525    my $collectparent; 
    526     if (defined $ENV{'GSDL3SRCHOME'}) { 
    527         $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite"); 
     526    if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server 
     527        if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place 
     528        $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite"); 
     529        }  
     530        else { # try the default location for the web directory 
     531        $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite"); 
     532        } 
    528533    } 
    529534    else { 
     
    647652       { 
    648653           my $collectparent; 
    649            if (defined $ENV{'GSDL3SRCHOME'}) { 
    650            $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite"); 
    651            } 
     654           if (defined $ENV{'GSDL3SRCHOME'}) { # we're dealing with a GS3 server 
     655           if(defined $ENV{'GSDL3HOME'}) { # in case the web directory is located in a separate place 
     656               $collectparent = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite"); 
     657           }  
     658           else { # try the default location for the web directory 
     659               $collectparent = &util::filename_cat($ENV{'GSDL3SRCHOME'},"web","sites","localsite"); 
     660           } 
     661           }           
    652662           else { 
    653663           # greenstone 2