Changeset 27411

Show
Ignore:
Timestamp:
23.05.2013 17:38:27 (6 years ago)
Author:
ak19
Message:

The -site flag is now compulsory for GS3 collections when running the mkcol, import, building and activation scripts.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

    r26206 r27411  
    10761076    my $import_pl = "import.pl"; # import is a reserved word, need to put it in quotes 
    10771077     
    1078     if (($script =~ m/$import_pl|buildcol.pl/) || ($script eq "mkcol.pl")) { # || ($script eq "schedule.pl") 
     1078    if (($script =~ m/$import_pl|buildcol.pl/) || ($script eq "mkcol.pl") || ($script eq "activate.pl")) { # || ($script eq "schedule.pl") 
    10791079    my $collect_directory = $gsdl_cgi->get_collection_dir($site);    
    10801080    $perl_args = "-collectdir \"$collect_directory\" " . $perl_args; 
     1081 
     1082    if($gsdl_cgi->greenstone_version() == 3) { 
     1083        $perl_args = "-site $site $perl_args"; 
     1084    } 
    10811085    } 
    10821086