Show
Ignore:
Timestamp:
27.01.2010 20:54:06 (10 years ago)
Author:
ak19
Message:

1. Minor changes for when when fedora uses Greenstone 3's tomcat: Only for GS3 in this case, don't need the file gsdl.xml since the file greenstone3.xml in GS3's tomcat already contains the necessary information. 2. In g2futil.pm: When writing out the file gsdl.xml, tries for 1 x 20 seconds to see whether the fedora server has started up again.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/g2f-buildcol.pl

    r18590 r21687  
    170170 
    171171    if (!$collectdir) { 
    172     ##    my $collect_dir = util::filename_cat($ENV{'GREENSTONE3_HOME'}, 
    173     ##                   "web","sites","localsite","collect"); 
    174  
    175  
    176     $collectdir = util::filename_cat($ENV{'GSDLHOME'},"collect"); 
     172    if($ENV{'GSDL3HOME'}) { 
     173        $collectdir = &util::filename_cat($ENV{'GSDL3HOME'},"sites","localsite","collect"); 
     174    } else { 
     175        $collectdir = util::filename_cat($ENV{'GSDLHOME'},"collect"); 
     176    } 
    177177    } 
    178178