5532506f80e32d334d9898c6e7d23a054c7df5b1 kate Wed Jun 27 21:12:18 2012 -0700 Add special-casing to separate out Small RNA as a separate data type diff --git src/hg/js/encodeMatrix.js src/hg/js/encodeMatrix.js index 0bd37c4..9e4577e 100644 --- src/hg/js/encodeMatrix.js +++ src/hg/js/encodeMatrix.js @@ -57,48 +57,50 @@ }, isFileSearch: function () { // Check search type cookie to retain user choice // Defaults to track search if no cookie set return ($.cookie(COOKIE_SEARCH) === COOKIE_SEARCH_FILES); }, getSearchUrl: function () { // Format a URL for search of type requested in search panel // Args are objects having mdbVar/mdbVal properties // Set each arg mdbValN to mdbVarN, empty out remaining vals to a total of 6 // (cheaper than querying for actual number) var prog, cartVar, url, i, j; - var argsLen = arguments.length; - var mdbVals = []; + var argsLen; + var mdbVals = [], mdbSearch; if ($('input:radio[name=searchType]:checked').val() === COOKIE_SEARCH_TRACKS) { prog = 'hgTracks'; cartVar = 'hgt_tSearch'; } else { prog = "hgFileSearch"; cartVar = "fsFileType=Any&hgfs_Search"; } url = '/cgi-bin/' + prog + '?db=' + encodeProject.getAssembly() + '&' + cartVar + '=search' + '&tsCurTab=advancedTab&hgt_tsPage=' + '&tsName=&tsDescr=&tsGroup=Any'; + mdbSearch = encodeProject.adjustMdbSearch($.makeArray(arguments)); + argsLen = mdbSearch.length; for (i = 0; i < argsLen; i += 1) { - url += '&hgt_mdbVar' + (i + 1) + '=' + arguments[i].mdbVar; + url += '&hgt_mdbVar' + (i + 1) + '=' + mdbSearch[i].mdbVar; // can pass an array or a single string -- so force to array for uniform handling // Search sees multiple mdbValN= variables for the same mdbVarN as a list of vals - mdbVals = [].concat(arguments[i].mdbVal); + mdbVals = [].concat(mdbSearch[i].mdbVal); for (j = 0; j < mdbVals.length; j++) { url += '&hgt_mdbVal' + (i + 1) + '=' + encodeURIComponent(mdbVals[j]); } } url += '&hgt_mdbVar' + (argsLen + 1) + '=view' + '&hgt_mdbVal' + (argsLen + 1) + '=Any'; for (i = argsLen + 1; i < 6; i += 1) { url += '&hgt_mdbVar' + (i + 1) + '=[]'; } return (url); }, // User preferences for Help panel disableHelp: function (isOff) {