Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/MGRAST/lib/resources/inbox.pm
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,10 @@ sub demultiplex {

# download barcode file to get number and names of barcoded pieces
my $outfiles = {};
my $bar_text = $self->get_shock_file($bar_node->{id}, undef, $self->token, undef, $self->{user_auth});
my ($bar_text, $err) = $self->get_shock_file($bar_node->{id}, undef, $self->token, undef, $self->{user_auth});
if ($err) {
$self->return_data( {"ERROR" => $err}, 500 );
}
foreach my $line (split(/\n/, $bar_text)) {
my ($b, $n) = split(/\t/, $line);
my $fname = $n ? $n : $b;
Expand Down Expand Up @@ -849,7 +852,7 @@ sub submit_awe_template {
# Submit job to AWE and check for successful submission
# mgrast owns awe job, user owns shock data
my $job = $self->post_awe_job($awf, $self->token, $self->mgrast_token, 1, $self->{user_auth}, "OAuth");
unless ($job && $job->{state} && $job->{state} eq "init") {
unless ($job && $job->{state} && ($job->{state} eq "init")) {
$self->return_data( {"ERROR" => "job could not be submitted"}, 500 );
}
return $job;
Expand Down
4 changes: 2 additions & 2 deletions src/MGRAST/lib/resources/resource.pm
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ sub post_awe_job {

my $content = undef;
if ($is_string) {
$content = { upload => [undef, "seqstats.awf", Content => $workflow] }
$content = { upload => [undef, "workflow.awf", Content => $workflow] }
} else {
$content = [ upload => [$workflow] ];
}
Expand All @@ -996,7 +996,7 @@ sub post_awe_job {
};

if ($@ || (! ref($response))) {
return [];
$self->return_data( {"ERROR" => "Unable to connect to AWE server"}, 500 );
} elsif (exists($response->{error}) && $response->{error}) {
$self->return_data( {"ERROR" => "Unable to submit to AWE: ".$response->{error}[0]}, $response->{status} );
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/MGRAST/workflows/demultiplex.awf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"outputs": {[% outputs %]
},
"userattr": {
"parent_seq_file": "[% seq_file_id %]"
"parent_seq_file": "[% seq_file_id %]",
"parent_barcode_file": "[% bar_file_id %]"
},
"taskid": "0",
Expand Down