Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

remove job submission: fixes to query_batch()

This commit is contained in:
David Anderson 2017-03-02 13:38:40 -08:00
parent 5b56a414cf
commit 2b6eff91f6
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
html/user/submit_rpc_handler.php
View File

@ -551,15 +551,19 @@ function show_job_details($wu) {
if ($wu->error_mask && $r->outcome == RESULT_OUTCOME_CLIENT_ERROR) {
echo " <exit_status>$r->exit_status</exit_status>\n";
}
if ($r->id == $wu->canonical_resultid) {
echo " <cpu_time>$r->cpu_time</cpu_time>\n";
}
}
if ($wu->error_mask) {
echo " <status>error</status>\n";
return;
}
if ($wu->canonical_resultid) {
echo " <status>done</status>\n";
} else {
if ($in_progress) {
if ($in_progress > 0) {
echo " <status>in_progress</status>\n";
} else {
echo " <status>queued</status>\n";
@ -593,31 +597,27 @@ function query_batch($r) {
}
$wus = BoincWorkunit::enum("batch = $batch->id", "order by id");
if (count($wus) > 0) {
$batch = get_batch_params($batch, $wus);
$get_cpu_time = (int)($r->get_cpu_time);
$get_job_details = (int)($r->get_job_details);
print_batch_params($batch, $get_cpu_time);
foreach ($wus as $wu) {
echo " <job>
<id>$wu->id</id>
<name>$wu->name</name>
<canonical_instance_id>$wu->canonical_resultid</canonical_instance_id>
$batch = get_batch_params($batch, $wus);
$get_cpu_time = (int)($r->get_cpu_time);
$get_job_details = (int)($r->get_job_details);
print_batch_params($batch, $get_cpu_time);
foreach ($wus as $wu) {
echo " <job>
<id>$wu->id</id>
<name>$wu->name</name>
<canonical_instance_id>$wu->canonical_resultid</canonical_instance_id>
";
// does anyone need this?
//
if (0) {
$n_outfiles = n_outfiles($wu);
echo " <n_outfiles>$n_outfiles</n_outfiles>\n";
}
if ($get_job_details) {
show_job_details($wu);
}
echo " </job>\n";
// does anyone need this?
//
if (0) {
$n_outfiles = n_outfiles($wu);
echo " <n_outfiles>$n_outfiles</n_outfiles>\n";
}
} else {
echo "<nojobs>no jobs found</nojobs>\n";
if ($get_job_details) {
show_job_details($wu);
}
echo " </job>\n";
}
echo "</query_batch>\n";
}

4
tools/submit_api_test.py
View File

@ -190,5 +190,5 @@ def test_get_output_files():
r = get_output_files(req)
print(r)
test_query_batch(326)
#test_submit_batch('batch_30')
test_query_batch(328)
#test_submit_batch('batch_31')