Changeset 18418 for gsdl/trunk

Timestamp:

2009-01-27T11:52:58+13:00 (15 years ago)

Author:

kjdon

Message:

a few mods for gs3 mode. added site param so can use that instead of having to type in collectdir. don't copy macros folder for gs3mode. made a few param descriptions come from dictionary

File:

• gsdl/trunk/bin/script/mkcol.pl (modified) (4 diffs)

gsdl/trunk/bin/script/mkcol.pl

@@ -76 +76 @@
     'reqd' => "no" },
       { 'name' => "gs3mode",
-    'desc' => "mkcol.gs3mode",
+    'desc' => "{mkcol.gs3mode}",
     'type' => "flag",
     'reqd' => "no" },
       { 'name' => "group",
-    'desc' => "mkcol.group",
+    'desc' => "{mkcol.group}",
     'type' => "flag",
     'reqd' => "no" },
       { 'name' => "collectdir",
     'desc' => "{mkcol.collectdir}",
+    'type' => "string",
+    'reqd' => "no" }, # For gs3, this collectdir must be provided.
+      { 'name' => "site",
+    'desc' => "{mkcol.site}",
     'type' => "string",
     'reqd' => "no" }, # For gs3, this collectdir must be provided.
@@ -136 +140 @@
 
 # options
-my ($creator, $optionfile, $maintainer, $gs3mode, $group, $collectdir, $public, 
+my ($creator, $optionfile, $maintainer, $gs3mode, $group, $collectdir, $site, 
+    $public, 
     $title, $about, $plugin, $quiet, $language, $win31compat, $gli);
 
@@ -172 +177 @@
     foreach my $file (@files)
     {
+    # don't want macros folder for gs3mode
+    next if ($gs3mode && $file =~ /^macros$/);
     my $thisfile = &util::filename_cat ($modeldir, $file);
 
@@ -382 +389 @@
     $cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
       }else {
-        &gsprintf(STDOUT, "{mkcol.no_collectdir}\n");
-        die "In gs3mode, '-collectdir <directory>' must be specified.\n";
+      if (defined $site && $site =~ /\w/) {
+          die "GSDL3HOME not set\n" unless defined $ENV{'GSDL3HOME'};
+
+          $cdir  = &util::filename_cat($ENV{'GSDL3HOME'}, "sites", $site, "collect");
+          if (!-d $cdir) {
+          &gsprintf(STDOUT, "{mkcol.no_collectdir}\n", $cdir);
+          die "\n";
+          }
+          $cdir = &util::filename_cat ($cdir, $collection);
+      } else {
+        &gsprintf(STDOUT, "{mkcol.no_collectdir_specified}\n");
+        die "\n";
+    }
       }
     }