Changeset 18603 for gsdl/trunk

Timestamp:

2009-03-02T12:58:04+13:00 (15 years ago)

Author:

kjdon

Message:

tidied some of this up a bit

File:

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

gsdl/trunk/bin/script/mkcol.pl

@@ -154 +154 @@
 sub traverse_dir
 {
-    my ($modeldir, $coldir, $gs3) = @_;
+    my ($modeldir, $coldir) = @_;
     my ($newfile, @filetext);
 
@@ -177 +177 @@
     foreach my $file (@files)
     {
-    # don't want macros folder for gs3mode
-    next if ($gs3mode && $file =~ /^macros$/);
+    if ($file =~ /^macros$/) {
+        
+        # don't want macros folder for gs3mode
+        next if $gs3mode;
+    }
+    if ($file =~ /^import$/) {
+        # don't want import for group
+        next if $group;
+    }
+    
     my $thisfile = &util::filename_cat ($modeldir, $file);
 
     if (-d $thisfile) {
         my $colfiledir = &util::filename_cat ($coldir, $file);
-        traverse_dir ($thisfile, $colfiledir, $gs3);
+        traverse_dir ($thisfile, $colfiledir);
 
     } else {
+
+        next if ($file =~ /~$/);
 
         my $destfile = $file;
@@ -194 +204 @@
         # 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/);
-        }
+        
+        if ($file =~ /^collect\.cfg$/) {
+        next if ($gs3mode || $group);
         }
-        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/group\.cfg/);
-        }
-
+        elsif ($file =~ /^group\.cfg$/) {
+        next unless $group;
+        $destfile =~ s/group\.cfg/collect\.cfg/;
         }
-
-
+        elsif ($file =~ /^collectionConfig\.xml$/) {
+        next unless $gs3mode;
+        }
+        
         &gsprintf(STDOUT, "{mkcol.doing_replacements}\n", $destfile)
         unless $quiet;
@@ -236 +233 @@
         $line =~ s/\*\*title\*\*/$title/g;
         $line =~ s/\*\*about\*\*/$about/g;
-        if (!$gs3) {
+        if (!$gs3mode) {
            $line =~ s/\*\*plugins\*\*/$pluginstring/g;
          }
@@ -370 +367 @@
     }
 
+    if ($gs3mode && $group) {
+    &gsprintf(STDERR,"{mkcol.group_not_valid_in_gs3}\n");
+    die "\n";
+    }
 
     # get the strings to include.
@@ -418 +419 @@
     unless $quiet;
 
-    &traverse_dir ($mdir, $cdir, $gs3mode);
+    &traverse_dir ($mdir, $cdir);
     &gsprintf(STDOUT, "\n{mkcol.success}\n", $cdir)
     unless $quiet;