Skip to content
4 changes: 2 additions & 2 deletions dockerfiles/develop/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MG-RAST v3 website / API for development
# MG-RAST v3-v4 website / API for development

FROM httpd:2.4.12

Expand Down Expand Up @@ -64,7 +64,7 @@ RUN apt-get install -y r-base r-cran-nlme r-cran-ecodist r-cran-rcolorbrewer r-c
echo 'source("http://bioconductor.org/biocLite.R"); biocLite("pcaMethods"); biocLite("preprocessCore"); biocLite("DESeq")' | R --no-save

# dirs to be mounted
RUN mkdir -p /MG-RAST /pipeline /tools /data /m5nr /config /ssl /usr/sbin/.postgresql
RUN mkdir -p /MG-RAST /MG-RASTv4 /pipeline /tools /data /m5nr /config /ssl /usr/sbin/.postgresql

# 3rd party dependency: FragGeneScan
RUN cd /tools && \
Expand Down
6 changes: 5 additions & 1 deletion src/MGRAST/lib/resources/annotation.pm
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,11 @@ sub prepare_data {
select STDOUT;
$| = 1;
my @head = map { $self->{attributes}{$format}{$_}[1] } sort keys %{$self->{attributes}{$format}};
print $cgi->header(-type => 'text/plain', -status => 200, -Access_Control_Allow_Origin => '*');
if ($cgi->param('browser')) {
print $cgi->header(-type => 'application/octet-stream', -status => 200, -Access_Control_Allow_Origin => '*');
} else {
print $cgi->header(-type => 'text/plain', -status => 200, -Access_Control_Allow_Origin => '*');
}
print join("\t", @head)."\n";

# get cassandra handle / prepare statement
Expand Down
Loading