a2a021905196ddc79f605ee081113e5eb00fd6ca kate Tue Apr 10 22:17:31 2012 -0700 hgEncodeApi cleanup - retire encodeExpId request. Merge functionality into experiments request (it now filters on db= parameter) diff --git src/hg/js/encodeProject.js src/hg/js/encodeProject.js index d75e755..ce392f6 100644 --- src/hg/js/encodeProject.js +++ src/hg/js/encodeProject.js @@ -39,42 +39,41 @@ getAssembly: function () { // Get currently set assembly return assembly; }, getServer: function () { // Get currently set server return server; }, // Server interaction serverRequests: { // Requests for data from server API experiment: "cmd=experiments", - expId: "cmd=experimentIds", dataType: "cmd=cv&type=dataType", cellType: "cmd=cv&type=cellType", antibody: "cmd=cv&type=antibody" }, loadAllFromServer: function (requests, handler) { // Execute requests to server via ajax var serverData = [], count = requests.length; $.each(requests, function (i, request) { - $.getJSON("http://" + server + cgi + "db=" + assembly + "&" + request, + $.getJSON("http://" + server + cgi + request + "&" + "db=" + assembly, function (data) { serverData[i] = data; if (--count === 0) { handler(serverData); } }); }); }, // Utility // Candidates for generic lib cmpNoCase: function (a, b) { // Case-insensitive sort. // Should be in a generic lib @@ -97,40 +96,30 @@ isIE8: function() { // Detect IE version 8 return ($.browser.msie && parseInt($.browser.version, 10) === 8); }, getSearchType: function () { return $('input:radio[name=searchType]:checked').val(); }, // Experiments, data types and cell types expIdFromAccession: function(accession) { return accession.slice(accessionPrefix.length); }, - getExpIdHash: function (ids) { - // Return hash of experiment ID's - - var hash = {}; - $.each(ids, function (i, id) { - hash[id.expId] = true; - }); - return hash; - }, - getDataType: function (term) { // Return dataType object using term // Needs loader function (using getDataGroups below for now) if (dataTypeTermHash !== undefined) { return dataTypeTermHash[term]; } return undefined; }, getDataTypeByLabel: function (label) { // Return dataType object using label // Needs loader function (using getDataGroups below for now) if (dataTypeLabelHash !== undefined) { return dataTypeLabelHash[label]; }