Changeset 15019 for gsdl/trunk/bin/script/mkcol.pl

Timestamp:

2008-02-27T17:09:21+13:00 (16 years ago)

Author:

davidb

Message:

mkcol.pl now takes "-group" option to signal that the the collection being formed is to be a "group-level" collection (i.e. one that acts as a container that conveniently groups a further set of collections together).

File:

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

gsdl/trunk/bin/script/mkcol.pl

@@ -79 +79 @@
     'type' => "flag",
     'reqd' => "no" },
+      { 'name' => "group",
+    'desc' => "mkcol.group",
+    'type' => "flag",
+    'reqd' => "no" },
       { 'name' => "collectdir",
     'desc' => "{mkcol.collectdir}",
@@ -112 +116 @@
     'desc' => "{mkcol.win31compat}",
     'type' => "enum",
-    'deft' => "true",
+    'deft' => "false",
     'list' => $win31compat_list,
     'reqd' => "no" },
@@ -132 +136 @@
 
 # options
-my ($creator, $optionfile, $maintainer, $gs3mode, $collectdir, $public, 
+my ($creator, $optionfile, $maintainer, $gs3mode, $group, $collectdir, $public, 
     $title, $about, $plugin, $quiet, $language, $win31compat, $gli);
 
 #other variables
-my ($collection, $capcollection, $pluginstring, @plugin);
+my ($collection, $capcollection, 
+    $collection_tail, $capcollection_tail, 
+    $pluginstring, @plugin);
 
 &main();
@@ -174 +180 @@
     } 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/;
         $destfile =~ s/^MODELCOL/$capcollection/;
+
+        # There are three configuration files in modelcol directory:
+        # collect.cfg, group.cfg and collectionConfig.xml.
+        # If it is gs2, copy relevant collect.cfg or group.cfg file; if gs3, copy collectionConfig.xml.
+
+        if ($gs3) {
+        if ($group) {
+            &gsprintf(STDERR,"{common.group_not_valid_in_gs3}\n");
+        }
+        else {
+            next if ($file =~ m/(collect|group)\.cfg/);
+        }
+        }
+        else {
+        # Greenstone 2
+        if ($group) {
+            next if ($file =~ m/collect\.cfg/);
+
+            # If get to here: input file = group.cfg
+            # => want output file = collect.cfg
+            $destfile =~ s/group\.cfg/collect\.cfg/;
+        }
+        else {
+            next if ($file =~ m/collect\.cfg/);
+        }
+
+        }
+
+
         &gsprintf(STDOUT, "{mkcol.doing_replacements}\n", $destfile)
         unless $quiet;
@@ -194 +222 @@
 
         while (defined (my $line = <INFILE>)) {
-        $line =~ s/\*\*collection\*\*/$collection/g;
-        $line =~ s/\*\*COLLECTION\*\*/$capcollection/g;
+        $line =~ s/\*\*collection\*\*/$collection_tail/g;
+        $line =~ s/\*\*COLLECTION\*\*/$capcollection_tail/g;
         $line =~ s/\*\*creator\*\*/$creator/g;
         $line =~ s/\*\*maintainer\*\*/$maintainer/g;
@@ -290 +318 @@
     # get and check the collection name
     ($collection) = @ARGV;
+
+    # get capitalised version of the collection
+    $capcollection = $collection;
+    $capcollection =~ tr/a-z/A-Z/;
+
+    $collection_tail = &util::get_dirsep_tail($collection);
+    $capcollection_tail = &util::get_dirsep_tail($capcollection);
+
+
     if (!defined($collection)) {
     &gsprintf(STDOUT, "{mkcol.no_colname}\n");
@@ -296 +333 @@
     }
 
-    if (($win31compat eq "true") && (length($collection)) > 8) {
+    if (($win31compat eq "true") && (length($collection_tail)) > 8) {
     &gsprintf(STDOUT, "{mkcol.long_colname}\n");
     die "\n";
@@ -306 +343 @@
     }
 
-    if ($collection eq "CVS") {
+    if ($collection_tail eq "CVS") {
     &gsprintf(STDOUT, "{mkcol.bad_name_cvs}\n");
+    die "\n";
+    }
+
+    if ($collection_tail eq ".svn") {
+    &gsprintf(STDOUT, "{mkcol.bad_name_svn}\n");
     die "\n";
     }
@@ -318 +360 @@
 
     if (!defined($title) || $title eq "") {
-    $title = $collection;
-    }
-
-    # get capitalised version of the collection
-    $capcollection = $collection;
-    $capcollection =~ tr/a-z/A-Z/;
+    $title = $collection_tail;
+    }
+
 
     # get the strings to include.