d4623fb82603fb8e114e9ff8bfd41d717213909e kate Tue Apr 10 20:09:28 2012 -0700 Factor out ENCODE-specific API calls into separate CGI. Basic/rough cut diff --git src/hg/js/encodeProject.js src/hg/js/encodeProject.js index e75242a..d75e755 100644 --- src/hg/js/encodeProject.js +++ src/hg/js/encodeProject.js @@ -1,31 +1,31 @@ /* encodeProject - javascript utilities for ENCODE-specific things such as controlled vocabulary and experiment table Formatted: jsbeautify.py -j -k Syntax checked: jslint --indent=4 --plusplus=true --strict=false --browser=true */ /*global $ */ var encodeProject = (function () { // Configurable variables - change with setup function below var server = "genome.ucsc.edu", assembly = "hg19", - cgi = "/cgi-bin/hgApi?"; + cgi = "/cgi-bin/hgEncodeApi?"; var accessionPrefix = 'wgEncodeE?'; var dataTypeLabelHash = {}, dataTypeTermHash = {}; var cellTypeTermHash = {}; var antibodyHash = {}, antibodyTargetHash = {}; // Functions return { // Configuration setup: function (settings) { // Change defaults if (settings.server) { @@ -38,32 +38,32 @@ 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=encodeExperiments", - expId: "cmd=encodeExpId", + 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, function (data) { serverData[i] = data; if (--count === 0) { handler(serverData);