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
2 changes: 1 addition & 1 deletion src/MGRAST/cgi/metagenomics.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sub main {
$layout->add_template($Conf::html_base.'/MGRAST-frontpage.tmpl', ["Home"]);
$layout->add_css($Conf::cgi_url."/Html/mgrast.css");
$layout->add_css($Conf::cgi_url."/Html/formalize.css");
$layout->add_javascript($Conf::cgi_url."/Html/jquery-1.4.2.min.js");
$layout->add_javascript($Conf::cgi_url."/Html/jquery.1.7.2.min.js");
$layout->add_javascript($Conf::cgi_url."/Html/jquery.formalize.min.js");
$layout->add_javascript($Conf::cgi_url."/Html/raphael-min.js");
$layout->show_icon(1);
Expand Down
56 changes: 28 additions & 28 deletions src/MGRAST/html/js/MetagenomeSearch.js
Original file line number Diff line number Diff line change
@@ -1,51 +1,48 @@
var api_url = 'http://dunkirk.mcs.anl.gov/~jbischof/mgrast/api2.cgi/search/metagenome?';
var datastore = {};
var result = 'result';
var update = 1;

function queryAPI (params) {
var type = params.type || "metadata";
var type = params.type || [ "metadata" ];
var query = params.query;
if (params.result) {
result = params.result;
}
var limit = params.limit || 100;

if (typeof type == "string") {
type = [ type ];
}

if (query === null) {
console.log('invalid request, missing query parameter');
return;
}

var url = api_url + type + "=" + query + "&limit=100";
var promises = [];

for (h=0;h<type.length; h++) {
var promise = jQuery.Deferred();
promises.push(promise);
var url = api_url + type[h] + "=" + query + "&limit=" + limit;
jQuery.getJSON(url, function(data) {
for (i=0;i<data.data.length;i++) {
datastore[data.data[i]["id"]] = data.data[i];
}
promise.resolve();
});
}

jQuery.getJSON(url, function(data) {
for (i=0;i<data.data.length;i++) {
datastore[data.data[i]["id"]] = data.data[i];
}
if (update<1) {
update++;
}
jQuery.when.apply(this, promises).then(function() {
updateResults();
});
}

function searchAll (term) {
update = -2;
queryAPI({"type": "metadata", "query": term});
queryAPI({"type": "function", "query": term});
queryAPI({"type": "organism", "query": term});
}

function clearSearch () {
datastore = {};
return;
}

function updateResults () {

if (update < 1) {
return;
}

var html = "<table class='table'><tr><th>Job</th><th>Metagenome</th><th>MG-RAST ID</th><th>biome</th><th>feature</th><th>material</th><th>country</th><th>location</th><th>PI</th></tr>";
var html = "<table class='table'><tr><th>Job</th><th>Metagenome</th><th>MG-RAST ID</th><th>Project</th><th>biome</th><th>feature</th><th>material</th><th>country</th><th>location</th><th>PI</th></tr>";
var rows = [];
for (i in datastore) {
if (datastore.hasOwnProperty(i)) {
Expand All @@ -56,11 +53,14 @@ function updateResults () {
rows.sort(sortByName);

for (i=0;i<rows.length;i++) {
datastore[rows[i][0]]["project_id"] = datastore[rows[i][0]]["project_id"].substr(3);
datastore[rows[i][0]]["id"] = datastore[rows[i][0]]["id"].substr(3);

html += "<tr>";
html += "<td>"+datastore[rows[i][0]]["job"]+"</td>";
html += "<td><a href='?page=MetagenomeOverview&metagenome="+datastore[rows[i][0]]["id"]+"'>"+datastore[rows[i][0]]["name"]+"</a></td>";
html += "<td><a href='?page=MetagenomeOverview&metagenome="+datastore[rows[i][0]]["id"]+"' target=_blank>"+datastore[rows[i][0]]["name"]+"</a></td>";
html += "<td>"+datastore[rows[i][0]]["id"]+"</td>";
html += "<td><a href='?page=MetagenomeProject&project="+datastore[rows[i][0]]["project_id"]+"'>"+datastore[rows[i][0]]["project_name"]+"</a></td>";
html += "<td><a href='?page=MetagenomeProject&project="+datastore[rows[i][0]]["project_id"]+"' target=_blank>"+datastore[rows[i][0]]["project_name"]+"</a></td>";
html += "<td>"+datastore[rows[i][0]]["biome"]+"</td>";
html += "<td>"+datastore[rows[i][0]]["feature"]+"</td>";
html += "<td>"+datastore[rows[i][0]]["material"]+"</td>";
Expand All @@ -75,7 +75,7 @@ function updateResults () {
var target = document.getElementById(result);
target.innerHTML = html;

clearSearch();
datastore = {};

return;
}
Expand Down
4 changes: 4 additions & 0 deletions src/MGRAST/lib/WebPage/MetagenomeSearch.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,10 @@ sub get_search_list {
return $to_search;
}

sub require_css {
return [ "$Conf::cgi_url/Html/bootstrap.min.css" ];
}

sub require_javascript {
return [ "$Conf::cgi_url/Html/MetagenomeSearch.js" ];
}