Changeset 1177 for trunk/gsdl/src/recpt
- Timestamp:
- 2000-05-19T16:57:23+12:00 (24 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/buildaction.cpp
r1172 r1177 27 27 #include "fileutil.h" 28 28 #include "htmlutils.h" 29 #include "gsdltools.h" 29 30 #include "buildaction.h" 30 31 … … 269 270 text_t bc1name = substr(args_entry.begin()+3,args_entry.end()); 270 271 text_t cached_cgiarg = "bcarg" + bc1name; 271 disp.setmacro(cached_cgiarg, "build", args[args_entry]);272 disp.setmacro(cached_cgiarg, "build", dm_safe(args[args_entry])); 272 273 } 273 274 args_here++; … … 440 441 ostream &logout) { 441 442 442 443 444 445 443 text_tarray wizard_split; 446 444 const text_t wizard = (args["wizard"].empty()) ? "buildcol" : args["wizard"]; … … 475 473 476 474 textout << outconvert << disp << headmess << content << "_build:framefooter_\n"; 477 text_t cmd = filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl"); 478 cmd += " httpbuild=\""+args["httpbuild"]+"\""; 479 cmd += " bc1copydata=\""+args["bc1copydata"]+"\""; 480 cmd += " bc1doimport=\""+args["bc1doimport"]+"\""; 481 cmd += " bc1dobuild=\""+args["bc1dobuild"]+"\""; 482 cmd += " bc1dirname=\""+args["bc1dirname"]+"\" bc1tmpname=\""+tmpname+"\" &"; 483 475 text_t cmd = "perl \"" + 476 filename_cat(gsdlhome, "cgi-bin", "webpage_buildcol.pl") + "\""; 477 cmd += " \"httpbuild="+args["httpbuild"]+"\""; 478 cmd += " \"bc1copydata="+args["bc1copydata"]+"\""; 479 cmd += " \"bc1doimport="+args["bc1doimport"]+"\""; 480 cmd += " \"bc1dobuild="+args["bc1dobuild"]+"\""; 481 cmd += " \"bc1dirname="+args["bc1dirname"]+"\" \"bc1tmpname="+tmpname+"\""; 482 // run webpage_buildcol.pl in background on unix systems 483 #if !defined (__WIN32__) 484 cmd += " &"; 485 #endif 486 484 487 char *cstr_cmd = cmd.getcstr(); 485 system(cstr_cmd); 488 489 #if defined (__WIN32__) 490 gsdl_system (cstr_cmd, logout); 491 #else 492 system (cstr_cmd); 493 #endif 494 486 495 delete cstr_cmd; 487 496 }
Note:
See TracChangeset
for help on using the changeset viewer.