*** empty log message ***

svn path=/trunk/boinc/; revision=3838
This commit is contained in:
Jeff Cobb 2004-07-10 00:12:06 +00:00
parent 83c300795d
commit 07870d11d5
4 changed files with 20 additions and 5 deletions

View File

@ -14980,4 +14980,14 @@ Brian 9 July 2004
- makes sure that project will get work if there is space on client - makes sure that project will get work if there is space on client
sched/ sched/
sched_send.C sched_send.C
Jeff 9 July 2004
- create_work() now take a new parameter - the path to the result template
file. This was needed because some programs (eg the sah splitter) are
not run from the project root directory.
tools/
backend_lib.C
backend_lib.h
create_work.C

View File

@ -279,6 +279,7 @@ int create_work(
DB_WORKUNIT& wu, DB_WORKUNIT& wu,
const char* _wu_template, const char* _wu_template,
const char* result_template_filename, const char* result_template_filename,
const char* result_template_filepath,
const char* infile_dir, const char* infile_dir,
const char** infiles, const char** infiles,
int ninfiles, int ninfiles,
@ -309,10 +310,10 @@ int create_work(
} }
retval = read_filename( retval = read_filename(
result_template_filename, _result_template, sizeof(_result_template) result_template_filepath, _result_template, sizeof(_result_template)
); );
if (retval) { if (retval) {
fprintf(stderr, "create_work: can't read result template\n"); fprintf(stderr, "create_work: can't read result template file %s\n", result_template_filepath);
return retval; return retval;
} }

View File

@ -51,7 +51,8 @@ extern int create_result(
extern int create_work( extern int create_work(
DB_WORKUNIT& wu, DB_WORKUNIT& wu,
const char* wu_template, const char* wu_template,
const char* result_template, const char* result_template_filename,
const char* result_template_filepath,
const char* infile_dir, const char* infile_dir,
const char** infiles, const char** infiles,
int ninfiles, int ninfiles,

View File

@ -61,7 +61,7 @@ int main(int argc, char** argv) {
DB_WORKUNIT wu; DB_WORKUNIT wu;
int retval; int retval;
char wu_template[LARGE_BLOB_SIZE]; char wu_template[LARGE_BLOB_SIZE];
char wu_template_file[256], result_template_file[256]; char wu_template_file[256], result_template_file[256], result_template_path[1024];
char keyfile[256]; char keyfile[256];
char** infiles = NULL; char** infiles = NULL;
int i, ninfiles; int i, ninfiles;
@ -182,10 +182,13 @@ int main(int argc, char** argv) {
exit(1); exit(1);
} }
strcpy(result_template_path, "./");
strcat(result_template_path, result_template_file);
retval = create_work( retval = create_work(
wu, wu,
wu_template, wu_template,
result_template_file, result_template_file,
result_template_path,
download_dir, download_dir,
const_cast<const char **>(infiles), const_cast<const char **>(infiles),
ninfiles, ninfiles,