Changeset 27411

Timestamp:

2013-05-23T17:38:27+12:00 (11 years ago)

Author:

ak19

Message:

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

File:

• main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl (modified) (1 diff)

main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

@@ -1076 +1076 @@
     my $import_pl = "import.pl"; # import is a reserved word, need to put it in quotes
     
-    if (($script =~ m/$import_pl|buildcol.pl/) || ($script eq "mkcol.pl")) { # || ($script eq "schedule.pl")
+    if (($script =~ m/$import_pl|buildcol.pl/) || ($script eq "mkcol.pl") || ($script eq "activate.pl")) { # || ($script eq "schedule.pl")
     my $collect_directory = $gsdl_cgi->get_collection_dir($site);   
     $perl_args = "-collectdir \"$collect_directory\" " . $perl_args;
+
+    if($gsdl_cgi->greenstone_version() == 3) {
+        $perl_args = "-site $site $perl_args";
+    }
     }