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
33 changes: 33 additions & 0 deletions src/MGRAST/lib/Metadata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,39 @@ sub get_job_metadata {
return exists($data->{$job->job_id}) ? $data->{$job->job_id} : {};
}

sub get_job_mixs {
my ($self, $job) = @_;

my $mixs = {};
$mixs->{project_id} = "";
$mixs->{project_name} = "";
$mixs->{PI_firstname} = "";
$mixs->{PI_lastname} = "";
eval {
$mixs->{project_id} = 'mgp'.$job->primary_project->{id};
$mixs->{project_name} = $job->primary_project->{name};
};
eval {
my $pdata = $job->primary_project->data;
$mixs->{PI_firstname} = $pdata->{PI_firstname};
$mixs->{PI_lastname} = $pdata->{PI_lastname};
};
my $lat_lon = $job->lat_lon;
$mixs->{latitude} = (@$lat_lon > 1) ? $lat_lon->[0] : "";
$mixs->{longitude} = (@$lat_lon > 1) ? $lat_lon->[1] : "";
$mixs->{country} = $job->country || "";
$mixs->{location} = $job->location || "";
$mixs->{biome} = $job->biome || "";
$mixs->{feature} = $job->feature || "";
$mixs->{material} = $job->material || "";
$mixs->{seq_method} = $job->seq_method || "";
$mixs->{sequence_type} = $job->seq_type || "";
$mixs->{collection_date} = $job->collection_date || "";
$mixs->{env_package_type} = $job->env_package_type || "";

return $mixs;
}

=pod

=item * B<is_job_compliant> (JobObject<job>)
Expand Down
10 changes: 6 additions & 4 deletions src/MGRAST/lib/resources/metadata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ sub info {
},
{ 'name' => "export",
'request' => $self->cgi->url."/".$self->name."/export/{ID}",
'description' => "Returns full nested metadata for a project in same format as template",
'description' => "Returns full nested metadata for a project in same format as template, or metadata for a single metagenome.",
'example' => [ $self->cgi->url."/".$self->name."/export/mgp128",
'all metadata for project mgp128' ],
'method' => "GET",
Expand Down Expand Up @@ -302,9 +302,11 @@ sub instance {
) {
$self->return_data( {"ERROR" => "insufficient permissions to view this data"}, 401 );
}
# prepare data
my $dataset = $mddb->get_jobs_metadata_fast([$mgid], 1);
$self->return_data($dataset->{$mgid});
# prepare data / get mixs
my $data = $mddb->get_jobs_metadata_fast([$mgid], 1)->{$mgid};
my $mixs = $mddb->get_job_mixs($job);
$data->{mixs} = $mixs;
$self->return_data($data);
}
# bad id
else {
Expand Down
34 changes: 6 additions & 28 deletions src/MGRAST/lib/resources/metagenome.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use URI::Escape;
use List::Util qw(first max min sum);
use POSIX qw(strftime floor);

use MGRAST::Metadata;
use MGRAST::Analysis;
use Conf;
use parent qw(resources::resource);
Expand Down Expand Up @@ -374,10 +375,9 @@ sub prepare_data {
my $mgids = [];
@$mgids = map { $_->{metagenome_id} } @$data;
my $jobdata = {};
my $mddb;
my $mddb = undef;

if (($verb eq 'metadata') || ($verb eq 'full')) {
use MGRAST::Metadata;
$mddb = MGRAST::Metadata->new();
$jobdata = $mddb->get_jobs_metadata_fast($mgids, 1);
}
Expand Down Expand Up @@ -459,32 +459,10 @@ sub prepare_data {
$obj->{pipeline_version} = '3.0';

if (($verb eq 'mixs') || ($verb eq 'full')) {
my $mixs = {};
$mixs->{project_id} = "";
$mixs->{project_name} = "";
$mixs->{PI_firstname} = "";
$mixs->{PI_lastname} = "";
eval {
$mixs->{project_id} = 'mgp'.$job->primary_project->{id};
$mixs->{project_name} = $job->primary_project->{name};
};
eval {
my $pdata = $job->primary_project->data;
$mixs->{PI_firstname} = $pdata->{PI_firstname};
$mixs->{PI_lastname} = $pdata->{PI_lastname};
};
my $lat_lon = $job->lat_lon;
$mixs->{latitude} = (@$lat_lon > 1) ? $lat_lon->[0] : "";
$mixs->{longitude} = (@$lat_lon > 1) ? $lat_lon->[1] : "";
$mixs->{country} = $job->country || "";
$mixs->{location} = $job->location || "";
$mixs->{collection_date} = $job->collection_date || "";
$mixs->{biome} = $job->biome || "";
$mixs->{feature} = $job->feature || "";
$mixs->{material} = $job->material || "";
$mixs->{env_package_type} = $job->env_package_type || "";
$mixs->{seq_method} = $job->seq_method || "";
$mixs->{sequence_type} = $job->seq_type || "";
if (! $mddb) {
$mddb = MGRAST::Metadata->new();
}
my $mixs = $mddb->get_job_mixs($job);
if ($verb eq 'full') {
$obj->{mixs} = $mixs;
} else {
Expand Down
21 changes: 14 additions & 7 deletions src/MGRAST/lib/resources/resource.pm
Original file line number Diff line number Diff line change
Expand Up @@ -297,17 +297,19 @@ sub header {
unless ($status) {
$status = 200;
}
my $header = $self->cgi->header(
-type => $self->format,
-status => $status,
-Access_Control_Allow_Origin => '*'
);
my $size = 0;
{
use bytes;
if ($text) {
$header->set('Content-Length' => length($text));
$size = length($text);
}
}
my $header = $self->cgi->header(
-type => $self->format,
-status => $status,
-Access_Control_Allow_Origin => '*',
-Content_Length => $size
);
return $header
}

Expand Down Expand Up @@ -362,6 +364,11 @@ sub check_pagination {
$limit = int($limit);
$path = $path || "";

# user asked for to large of an offset
if ($offset >= $total) {
$self->return_data({"ERROR" => "Requested offset ($offset) is greater than availabale objects ($total)."}, 404);
}

my $total_count = $total || scalar(@$data);
my $prev_offset = (($offset - $limit) < 0) ? 0 : $offset - $limit;
my $next_offset = $offset + $limit;
Expand Down Expand Up @@ -462,7 +469,7 @@ sub return_data {
$data = { 'data' => $data };
}
$self->format("application/json");
my $data_text = $self->cgi->param('callback')."(".$self->json->encode($data).");"
my $data_text = $self->cgi->param('callback')."(".$self->json->encode($data).");";
print $self->header($status, $data_text);
print $data_text;
exit 0;
Expand Down