Changeset 1461

Timestamp:

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

Author:

sjboddie

Message:

A few fixes to collectoraction

Location:

trunk/gsdl

Files:

• bin/script/build (modified) (2 diffs)
• bin/script/cancel_build.pl (modified) (1 diff)
• bin/script/cleantmp.pl (added)
• src/recpt/collectoraction.cpp (modified) (2 diffs)

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) {

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -249 +249 @@
   text_t &current_page = args["cp"];
 
-  if (current_page != "intro" && current_page != "bildstatus") {
+  // note that the "bildstatus" and "bildframe1" pages don't actually do anything
+  // functional so we don't need to worry about authenticating them (it's the 
+  // underlying "bild" page that does the building (anc creates the frameset))
+  // This helps us overcome a bit of a problem we have with multiple pages trying
+  // to read from the key.db database at the same time.
+  if (current_page != "intro" && current_page != "bildstatus" && current_page != "bildframe1") {
     // authenticate the user if authentication is available
     args["uan"] = 1;
@@ -1206 +1211 @@
   // "rm -r" in c++?). One day I'll spend some time sorting it out ... maybe.
   text_t cancel_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "cancel_build.pl");
-  cancel_cmd += " -collectdir \"" + get_collectdir(args) + "\" " + args["bc1dirname"];
+  cancel_cmd += " -collectdir \"" + filename_cat (gsdlhome, "tmp", args["bc1tmp"]) + 
+    "\" " + args["bc1dirname"];
   char *cancel_cmdc = cancel_cmd.getcstr();
   system (cancel_cmdc);