Changeset 1461
- Timestamp:
- 2000-08-28T11:50:35+12:00 (24 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/bin/script/build
r1454 r1461 98 98 print STDERR " -download directory Directory (or file) to get import documents from.\n"; 99 99 print STDERR " There may be multiple download directories and they\n"; 100 print STDERR " may be of type http://, ftp://, or file://\n .";100 print STDERR " may be of type http://, ftp://, or file://\n"; 101 101 print STDERR " Note that any existing import directory will be\n"; 102 102 print STDERR " deleted to make way for the downloaded data if\n"; … … 279 279 280 280 # remove the cached arhives 281 if ($save_archives )-d "${archivedir}.org") {281 if ($save_archives && -d "${archivedir}.org") { 282 282 &util::rm_r ("${archivedir}.org"); 283 283 } -
trunk/gsdl/bin/script/cancel_build.pl
r1454 r1461 68 68 } 69 69 70 my $cdir = &util::filename_cat ($collectdir, $collection); 70 71 if ($collectdir eq "") { 71 72 $collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect"); 73 $cdir = &util::filename_cat ($collectdir, $collection); 74 } elsif (!-d $cdir) { 75 $cdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $collection); 72 76 } 73 74 my $cdir = &util::filename_cat ($collectdir, $collection);75 77 76 78 if (! -d $cdir) { -
trunk/gsdl/src/recpt/collectoraction.cpp
r1457 r1461 249 249 text_t ¤t_page = args["cp"]; 250 250 251 if (current_page != "intro" && current_page != "bildstatus") { 251 // note that the "bildstatus" and "bildframe1" pages don't actually do anything 252 // functional so we don't need to worry about authenticating them (it's the 253 // underlying "bild" page that does the building (anc creates the frameset)) 254 // This helps us overcome a bit of a problem we have with multiple pages trying 255 // to read from the key.db database at the same time. 256 if (current_page != "intro" && current_page != "bildstatus" && current_page != "bildframe1") { 252 257 // authenticate the user if authentication is available 253 258 args["uan"] = 1; … … 1206 1211 // "rm -r" in c++?). One day I'll spend some time sorting it out ... maybe. 1207 1212 text_t cancel_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "cancel_build.pl"); 1208 cancel_cmd += " -collectdir \"" + get_collectdir(args) + "\" " + args["bc1dirname"]; 1213 cancel_cmd += " -collectdir \"" + filename_cat (gsdlhome, "tmp", args["bc1tmp"]) + 1214 "\" " + args["bc1dirname"]; 1209 1215 char *cancel_cmdc = cancel_cmd.getcstr(); 1210 1216 system (cancel_cmdc);
Note:
See TracChangeset
for help on using the changeset viewer.