Changeset 14032

Timestamp:

2007-04-30T16:48:18+12:00 (17 years ago)

Author:

xiao

Message:

Changes made to look for collectionConfig.xml in gs3 mode and collect.cfg in gs2 mode, rather than presumably only for the file collect.cfg in the modelcol directory and copy to a specific collection etc directory. When using this script on the command line in greenstone 3 mode, an option '-gs3mode' MUST be provided, along with the option '-collectdir <collection directory name>'.

File:

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

trunk/gsdl/bin/script/mkcol.pl

@@ -75 +75 @@
     'type' => "string",
     'reqd' => "no" },
+      { 'name' => "gs3mode",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no" },
       { 'name' => "collectdir",
     'desc' => "{mkcol.collectdir}",
     'type' => "string",
-    'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
-    'reqd' => "no" },
+    'reqd' => "no" }, # For gs3, this collectdir must be provided.
       { 'name' => "public",
     'desc' => "{mkcol.public}",
@@ -129 +132 @@
 
 # options
-my ($creator, $optionfile, $maintainer, $collectdir, $public, 
+my ($creator, $optionfile, $maintainer, $gs3mode, $collectdir, $public, 
     $title, $about, $plugin, $quiet, $language, $win31compat, $gli);
 
@@ -140 +143 @@
 sub traverse_dir
 {
-    my ($modeldir, $coldir) = @_;
+    my ($modeldir, $coldir, $gs3) = @_;
     my ($newfile, @filetext);
 
     if (!(-e $coldir)) {
+    
 
     my $store_umask = umask(0002);
@@ -163 +167 @@
     {
     my $thisfile = &util::filename_cat ($modeldir, $file);
+
     if (-d $thisfile) {
         my $colfiledir = &util::filename_cat ($coldir, $file);
-        traverse_dir ($thisfile, $colfiledir);
+        traverse_dir ($thisfile, $colfiledir, $gs3);
 
     } else {
+
+        # There are only two configuration files in modelcol directory:
+        # collect.cfg and collectionConfig.xml.
+        # If it is gs2, copy collect.cfg file; if gs3, copy collectionConfig.xml.
+      if ( ($gs3 && $file =~ /collect\.cfg/) || (!$gs3 && $file =~ /collectionConfig\.xml/) ) {
+          
+        next;
+      }
         my $destfile = $file;
         $destfile =~ s/^modelcol/$collection/;
@@ -188 +201 @@
         $line =~ s/\*\*title\*\*/$title/g;
         $line =~ s/\*\*about\*\*/$about/g;
-        $line =~ s/\*\*plugins\*\*/$pluginstring/g;
+        if (!$gs3) {
+           $line =~ s/\*\*plugins\*\*/$pluginstring/g;
+         }
 
         print OUTFILE $line;
@@ -204 +219 @@
     my $xml = 0;
     
+
     my $hashParsingResult = {};
     my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
@@ -324 +340 @@
     $cdir = &util::filename_cat ($collectdir, $collection);
     } else {
+      if (!$gs3mode) {
     $cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
+      }else {
+        &gsprintf(STDOUT, "{mkcol.no_collectdir}\n");
+        die "In gs3mode, '-collectdir <directory>' must be specified.\n";
+      }
     }
 
@@ -339 +360 @@
     &gsprintf(STDOUT, "\n{mkcol.creating_col}...\n", $collection)
     unless $quiet;
-    &traverse_dir ($mdir, $cdir);
+
+    &traverse_dir ($mdir, $cdir, $gs3mode);
     &gsprintf(STDOUT, "\n{mkcol.success}\n", $cdir)
     unless $quiet;