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
22 changes: 9 additions & 13 deletions src/MGRAST/lib/GoogleAnalytics.pm
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,20 @@ sub track_page_view {

my $visitor_id = $uid || &get_random_number();

my $utm_gif_location = "http://www.google-analytics.com/__utm.gif";
my $url = "http://www.google-analytics.com/collect";

my $remote_address = "";
if (exists($ENV{'REMOTE_ADDR'})) {
$remote_address = $ENV{'REMOTE_ADDR'};
}

# Construct the gif hit url.
my $utm_url = $utm_gif_location . '?' .
'utmwv=' . VERSION .
'&utmn=' . get_random_number() .
'&utmhn=' . uri_escape($domain_name) .
'&utmr=' . uri_escape($document_referer) .
'&utmp=' . uri_escape($document_path) .
'&utmac=' . $account .
'&utmcc=__utma%3D999.999.999.999.999.1%3B' .
'&utmvid=' . $visitor_id .
'&utmip=' . anonymize_ip($remote_address);
# Construct the payload
my $content = 'v=' . VERSION .
'&tid=' . $account .
'&cid=' . anonymize_ip($remote_address) .
'&t=pageview' .
'&vid=' . $visitor_id .
'&dl=' . uri_escape($document_path);

my $ua = LWP::UserAgent->new;

Expand All @@ -69,7 +65,7 @@ sub track_page_view {
$ua->agent($ENV{'HTTP_USER_AGENT'});
}

my $ga_output = $ua->get($utm_url);
my $ga_output = $ua->post($url, Content => $content);

if (defined($debug) && !$ga_output->is_success) {
print STDERR $ga_output->status_line;
Expand Down
2 changes: 1 addition & 1 deletion src/MGRAST/lib/WebPage/MetagenomeOverview.pm
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ sub output {
<p>DRISEE is a tool that utilizes artificial duplicate reads (ADRs) to provide a platform independent assessment of sequencing error in metagenomic (or genomic) sequencing data. DRISEE is designed to consider shotgun data. Currently, it is not appropriate for amplicon data.</p>
<p>Note that DRISEE is designed to examine sequencing error in raw whole genome shotgun sequence data. It assumes that adapter and/or barcode sequences have been removed, but that the sequence data have not been modified in any additional way. (e.g.) Assembly or merging, QC based triage or trimming will both reduce DRISEE's ability to provide an accurate assessment of error by removing error before it is analyzed.</p>~;

if (exists($job_stats->{drisee_score_raw}) && ($drisee_num == 0) && (! $is_rna)) {
if (($drisee_num == 0) && (! $is_rna)) {
$html .= qq~<a name='drisee_ref'></a>
<h3>DRISEE
<a target=_blank href='http://blog.metagenomics.anl.gov/glossary-of-mg-rast-terms-and-concepts/#drisee' style='font-size:14px;padding-left:5px;'>[?]</a></h3>
Expand Down
4 changes: 2 additions & 2 deletions src/MGRAST/lib/resources/matrix.pm
Original file line number Diff line number Diff line change
Expand Up @@ -618,11 +618,11 @@ sub prepare_data {
my $bcols = [];
my $r_map = ($type eq 'feature') ? $md52ann : ($prot_func ? {} : $self->get_hierarchy($mgdb, $type, $glvl, $source, $leaf_node));
foreach my $rid (sort {$row_ids->{$a} <=> $row_ids->{$b}} keys %$row_ids) {
my $rmd = exists($r_map->{$rid}) ? (($type eq 'feature') ? $r_map->{$rid} : { $mtype => $r_map->{$rid} }) : undef;
my $rmd = exists($r_map->{$rid}) ? (($type eq 'feature') ? $r_map->{$rid} : { $mtype => $r_map->{$rid} }) : {};
if ($leaf_node && $taxid && ($type eq 'organism') && exists($self->{org2tid}{$rid})) {
push @$brows, { id => $self->{org2tid}{$rid}, metadata => $rmd };
} elsif ($prot_func) {
push @$brows, { id => $rid, metadata => undef };
push @$brows, { id => $rid, metadata => {} };
} else {
push @$brows, { id => $rid, metadata => $rmd };
}
Expand Down
3 changes: 0 additions & 3 deletions src/WebApplication/WebComponent/Register.pm
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,6 @@ sub output {
$existing_account .= "<tr><td>Login<sup><span style='color: red;'>*</span></sup></td><td><input type='text' name='login' value='" . $login . "'></td></tr>";
$existing_account .= "<tr><td>eMail<sup><span style='color: red;'>*</span></sup></td><td><input type='text' name='email' value='" . $email . "'></td></tr>";
$existing_account .= "<tr><td>Group Name</td><td><input type='text' name='group' value='" . $group . "'><br><i>(only enter if assigned by a group administrator)</i></td></tr>";
if ($self->application->backend->name eq 'MGRAST') {
$existing_account .= "<tr><td>Add me to the MG-RAST mailing-list</td><td><input type='checkbox' name='mailinglist' checked='checked'><br><i>$mlist_msg</i></td></tr>";
}
$existing_account .= "<tr><td>&nbsp;</td><td><input type='submit' class='button' value='Request'></td></tr>";
$existing_account .= "</table>";

Expand Down