7544fd2a03bf573a9a12195d86a2fc082a88de78 tdreszer Tue Apr 5 15:17:56 2011 -0700 Tightened the screws on searching by mdb vars where the search is either for files or tables diff --git src/hg/js/utils.js src/hg/js/utils.js index 1bdfa57..cc08d4a 100644 --- src/hg/js/utils.js +++ src/hg/js/utils.js @@ -1716,34 +1716,40 @@ } function findTracksMdbVarChanged(obj) { // Ajax call to repopulate a metadata vals select when mdb var changes // This handles the currnet case when 2 vars have the same name (e.g. advanced, files tabs) findTracksClearFound(); // Changing values so abandon what has been found var newVar = $(obj).val(); var a = /hgt_mdbVar(\d+)/.exec(obj.name); // NOTE must match METADATA_NAME_PREFIX in hg/hgTracks/searchTracks.c if(newVar != undefined && a && a[1]) { var num = a[1]; if ($('#advancedTab').length == 1 && $('#filesTab').length == 1) { $("select.mdbVar[name='hgt_mdbVar"+num+"'][value!='"+newVar+"']").val(newVar); } + var cgiVars = "db=" + getDb() + "&cmd=hgt_mdbVal" + num + "&var=" + newVar; + if (document.URL.search('hgFileSearch') != -1) + cgiVars += "&fileSearch=1"; + else + cgiVars += "&fileSearch=0"; + $.ajax({ type: "GET", url: "../cgi-bin/hgApi", - data: "db=" + getDb() + "&cmd=hgt_mdbVal" + num + "&var=" + newVar, + data: cgiVars, trueSuccess: findTracksHandleNewMdbVals, success: catchErrorOrDispatch, error: errorHandler, cache: true, cmd: "hgt_mdbVal" + num, // NOTE must match METADATA_VALUE_PREFIX in hg/hgTracks/searchTracks.c num: num }); } //findTracksSearchButtonsEnable(true); } function findTracksHandleNewMdbVals(response, status) { // Handle ajax response (repopulate a metadata val select) // This handles the currnet case when 2 vars have the same name (e.g. advanced, files tabs)