Changeset 1461 for trunk/gsdl/bin/script

Timestamp:

2000-08-28T11:50:35+12:00 (24 years ago)

Author:

sjboddie

Message:

A few fixes to collectoraction

Location:

trunk/gsdl/bin/script

Files:

• build (modified) (2 diffs)
• cancel_build.pl (modified) (1 diff)
• cleantmp.pl (added)

trunk/gsdl/bin/script/build

@@ -98 +98 @@
     print STDERR "   -download directory     Directory (or file) to get import documents from.\n";
     print STDERR "                           There may be multiple download directories and they\n";
-    print STDERR "                           may be of type http://, ftp://, or file://\n.";
+    print STDERR "                           may be of type http://, ftp://, or file://\n";
     print STDERR "                           Note that any existing import directory will be\n";
     print STDERR "                           deleted to make way for the downloaded data if\n";
@@ -279 +279 @@
 
     # remove the cached arhives
-    if ($save_archives) -d "${archivedir}.org") {
+    if ($save_archives && -d "${archivedir}.org") {
     &util::rm_r ("${archivedir}.org");
     }

trunk/gsdl/bin/script/cancel_build.pl

@@ -68 +68 @@
     }
 
+    my $cdir = &util::filename_cat ($collectdir, $collection);
     if ($collectdir eq "") {
     $collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect");
+    $cdir = &util::filename_cat ($collectdir, $collection);
+    } elsif (!-d $cdir) {
+    $cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection);
     }
-                       
-    my $cdir = &util::filename_cat ($collectdir, $collection);
 
     if (! -d $cdir) {