Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

update inbox / submission to handle new awe output format #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teharrison merged 1 commit into from
Jul 23, 2015
Merged

update inbox / submission to handle new awe output format #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions 10 src/MGRAST/lib/resources/resource.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,10 +1220,12 @@ sub get_task_report {
my $rfile = "awe_".$type.".txt";

# check shock if missing
if ((! $rtext) && exists($task->{outputs}) && exists($task->{outputs}{$rfile})) {
my $rnode = $task->{outputs}{$rfile}{node};
if ($rnode && ($rnode ne "-")) {
($rtext, undef) = $self->get_shock_file($rnode, undef, $auth, undef, $authPrefix);
if ((! $rtext) && exists($task->{outputs})) {
foreach my $out (@{$task->{outputs}}) {
if (($out->{filename} eq $rfile) && $out->{node} && ($out->{node} ne "-")) {
($rtext, undef) = $self->get_shock_file($out->{node}, undef, $auth, undef, $authPrefix);
last;
}
}
}
return $rtext || "";
Expand Down
11 changes: 7 additions & 4 deletions 11 src/MGRAST/lib/resources/submission.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ sub status {
foreach my $task (@{$submit->{tasks}}) {
my $summery = {
stage => $task->{cmd}{description},
inputs => [ keys %{$task->{inputs}} ],
inputs => [ map { $_->{filename} } @{$task->{inputs}} ],
status => $task->{state}
};
if ($task->{state} eq 'suspend') {
Expand Down Expand Up @@ -757,10 +757,13 @@ sub submission_jobs {
sub get_param_node {
my ($self, $job) = @_;
if ($job->{tasks} && (@{$job->{tasks}} > 0)) {
return $job->{tasks}[-1]{inputs}{$self->{param_file}}{node};
} else {
return undef;
foreach my $out (@{$job->{tasks}[-1]{inputs}}) {
if ($out->{filename} eq $self->{param_file}) {
return $out->{node};
}
}
}
return undef;
}

sub parse_submit_output {
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.