Changeset 1427 for trunk

Timestamp:

2000-08-20T20:32:08+12:00 (24 years ago)

Author:

sjboddie

Message:

Tidied up mkcol.pl slightly - now uses filename_cat everywhere to prevent
weird looking (though perfectly functional) filenames showing up in windows

• Also added ZIPPlug to new collections by default

File:

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

trunk/gsdl/bin/script/mkcol.pl

@@ -37 +37 @@
 
 use parsargv;
+use util;
 
 sub print_usage {
@@ -81 +82 @@
     foreach $file (@files)
     {
-    if (-d "$modeldir/$file") {
-        traverse_dir ("$modeldir/$file", "$coldir/$file");
+    my $thisfile = &util::filename_cat ($modeldir, $file);
+    if (-d $thisfile) {
+        my $colfiledir = &util::filename_cat ($coldir, $file);
+        traverse_dir ($thisfile, $colfiledir);
 
     } else {
@@ -88 +91 @@
         $destfile =~ s/^\modelcol/$collection/;
         $destfile =~ s/^\MODELCOL/$capcollection/;
-
-        print STDERR "doing replacements for $modeldir/$file\n";
-        open (INFILE, "$modeldir/$file") || 
-        die "Can't read file $modeldir/$file";
-        open (OUTFILE, ">$coldir/$destfile") ||
-        die "Can't create file $coldir/destfile";
+        $destfile = &util::filename_cat ($coldir, $destfile);
+
+        print STDERR "doing replacements for $thisfile\n";
+        open (INFILE, $thisfile) || 
+        die "Can't read file $thisfile";
+        open (OUTFILE, ">$destfile") ||
+        die "Can't create file $destfile";
 
         while (defined ($line = <INFILE>)) {
@@ -142 +146 @@
 # load default plugins if none were on command line    
 if (!scalar(@plugin)) {
-    @plugin = (GMLPlug,TEXTPlug,HTMLPlug,EMAILPlug,ArcPlug,RecPlug);
+    @plugin = (ZIPPlug,GMLPlug,TEXTPlug,HTMLPlug,EMAILPlug,ArcPlug,RecPlug);
 }
 
@@ -148 +152 @@
 ($collection) = @ARGV;
 if (!defined($collection)) {
+    print STDERR "no collection name was specified\n";
     &print_usage();
     die "\n";
@@ -206 +211 @@
 }
 
+$mdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", "modelcol");
+$cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
+
 # make sure the model collection exists
-die "Cannot find the model collection $ENV{'GSDLHOME'}/collect/modelcol" unless
-    (-d "$ENV{'GSDLHOME'}/collect/modelcol");
+die "Cannot find the model collection $mdir" unless (-d $mdir);
 
 # make sure this collection does not already exist
-if (-e "$ENV{'GSDLHOME'}/collect/$collection") {
+if (-e $cdir) {
     print STDERR "This collection already exists\n";
     die "\n";
@@ -218 +225 @@
 
 # start creating the collection
-print STDERR "Creating the collection $collection\n\n";
-&traverse_dir ("$ENV{'GSDLHOME'}/collect/modelcol", "$ENV{'GSDLHOME'}/collect/$collection");
-print STDERR "\n\nThe new collection is in $ENV{'GSDLHOME'}/collect/$collection.\n\n";
-
-
+print STDERR "Creating the collection $collection\n";
+&traverse_dir ($mdir, $cdir);
+print STDERR "The new collection is in $cdir.\n";
+
+