ded9f614498cabf4aab269835e5f6d3452d43bb5 galt Tue May 20 11:31:11 2025 -0700 Removed debugging hgBlat. refs #32751 diff --git src/hg/hgBlat/hgBlat.c src/hg/hgBlat/hgBlat.c index 3433e8ef2ec..120b1b9bbb7 100644 --- src/hg/hgBlat/hgBlat.c +++ src/hg/hgBlat/hgBlat.c @@ -644,118 +644,101 @@ struct dyString *url = dyStringNew(256); dyStringPrintf(url, "http%s://%s", sameString(getenv("HTTPS"), "on") ? "s" : "", getenv("HTTP_HOST")); dyStringPrintf(url, "%s", hgcUrl+2); dyStringPrintf(url, "?o=%d", psl->tStart); dyStringPrintf(url, "&t=%d", psl->tEnd); dyStringPrintf(url, "&g=%s", "buildBigPsl"); dyStringPrintf(url, "&i=%s", cgiEncode(item)); dyStringPrintf(url, "&c=%s", cgiEncode(psl->tName)); dyStringPrintf(url, "&l=%d", psl->tStart); dyStringPrintf(url, "&r=%d", psl->tEnd); dyStringPrintf(url, "&%s=%s", cartSessionVarName(), cartSessionId(cart)); dyStringPrintf(url, "&Submit=%s", cgiEncode("Create a stable custom track with these results")); if (pslIsProtein(psl)) dyStringPrintf(url, "&isProt=on"); - // We will add them to the url later at runtime in js and ajax. - //dyStringPrintf(url, "&trackName=%s", cgiEncode(trackName)); - //dyStringPrintf(url, "&trackDescription=%s", cgiEncode(trackDescription)); - - //warn("GALT DEBUG hgsid = [%s]", cartSessionId(cart)); - - //warn("GALT DEBUG url = [%s]", url->string); - jsInlineF( "var luckyLocation = '';\n" ); if(feelingLucky) { /* If we found something jump browser to there. */ if(slCount(pslList) > 0) printLuckyRedirect(browserUrl, pslList, database, pslName, faName, uiState, unhideTrack); } // RENAME BLAT CT FORM // new re-submit code with new trackname and decription - if (!feelingLucky) // TODO GALT may revisit this condition + if (!feelingLucky) { printf("<div id=renameFormItem style='display: none'>\n"); printf("<FORM ACTION=>\n"); printf("<INPUT TYPE=SUBMIT NAME=Submit id='showRenameForm' VALUE=\"Rename Custom Track\">\n"); printf("</FORM>\n"); printf("</div>\n"); printf("<div id=renameForm style='display: none'>\n"); char *hgcUrl = hgcName(); printf( "<DIV STYLE=\"display:block;\"><FORM ACTION=\"%s\" METHOD=\"%s\" NAME=\"customTrackForm\">\n", hgcUrl,cartUsualString(cart, "formMethod", "POST")); printf("<TABLE><TR><TD>Custom track name: "); - cgiMakeTextVar( "trackName", "FAKETRACKNAME", 30); // TODO GALT track name or shortLabel + cgiMakeTextVar( "trackName", "FAKETRACKNAME", 30); printf("</TD></TR>"); printf("<TR><TD> Custom track description: "); cgiMakeTextVar( "trackDescription", "FAKETRACKDESCRIPTION",50); // track description or longLabel printf("</TD></TR>"); // remove the current blat ct so we can create a new one. cgiMakeHiddenVar(CT_DO_REMOVE_VAR, "Remove Custom track"); cgiMakeHiddenVar(CT_SELECTED_TABLE_VAR, "FAKETRACKNAME"); printf("<TR><TD><INPUT TYPE=SUBMIT NAME=Submit id=submitTrackNameDescr VALUE=\"Submit\">\n"); puts("</TD></TR>"); printf("</TABLE></FORM></DIV>"); printf("</div>\n"); } - if (!feelingLucky) // TODO GALT may revisit this condition + if (!feelingLucky) { // REMOVE CT BUTTON FORM. printf("<div id=deleteCtForm style='display: none'>\n"); printf("<FORM ACTION=\"%s?hgsid=%s&db=%s\" NAME=\"MAIN_FORM\" METHOD=%s>\n\n", hgTracksName(), cartSessionId(cart), database, cartUsualString(cart, "formMethod", "POST")); cartSaveSession(cart); cgiMakeButton(CT_DO_REMOVE_VAR, "Delete Custom Track"); - cgiMakeHiddenVar(CT_SELECTED_TABLE_VAR, "FAKETRACKNAME"); // TODO update js to populate this with the current ct ct_blat variable. + cgiMakeHiddenVar(CT_SELECTED_TABLE_VAR, "FAKETRACKNAME"); printf("</FORM>\n"); printf("</div>\n"); } - - - //if (feelingLucky) - //warn("GALT DEBUG feelingLucky and autoBigPsl"); // REMOVE - - jsInlineF( "var ct_blat = '';\n" "\n" "function buildBigPslCtSuccess (content, status)\n" "{ // Finishes the succesful creation of blat ct bigPsl. Called by ajax return.\n" " // saves the ct name so it can be used later for rename or delete.\n" - "//window.alert('status='+status); // debug remove\n" - "//window.alert('content='+content); // debug remove\n" "\n" "var matchWord = '&table=';\n" "var ct_blatPos = content.indexOf(matchWord) + matchWord.length;\n" "\n" "if (ct_blatPos >= 0)\n" " {\n" " var ct_blatPosEnd = content.indexOf('\"', ct_blatPos);\n" " ct_blat = content.slice(ct_blatPos, ct_blatPosEnd);\n" - " //window.alert('DEBUG GALT TEST ajax success hgc buildBigPsl called. ct_blat='+ct_blat);\n" " if (luckyLocation == '')\n" " {\n" " $('input[name=\""CT_SELECTED_TABLE_VAR"\"]')[0].value = ct_blat;\n" " $('input[name=\""CT_SELECTED_TABLE_VAR"\"]')[1].value = ct_blat;\n" " }\n" " }\n" "}\n" "\n" "function buildBigPslCt (url, trackName, trackDescription)\n" "{ // call hgc to buildBigPsl from blat result.\n" "\n" "var cgiVars = 'trackName='+encodeURIComponent(trackName)+'&trackDescription='+encodeURIComponent(trackDescription);\n" "if (!ct_blat !== '')\n" " {\n" " cgiVars += '&"CT_DO_REMOVE_VAR"='+encodeURIComponent('Remove Custom Track');\n" @@ -767,63 +750,58 @@ " url: url,\n" " data: cgiVars,\n" " dataType: 'html',\n" " trueSuccess: buildBigPslCtSuccess,\n" " success: catchErrorOrDispatch,\n" " error: errorHandler,\n" " cache: false,\n" " async: false\n" " });\n" "}\n" "\n" "var url='%s';\n" "var trackName='%s';\n" "var trackDescription='%s';\n" "$(document).ready(function() {\n" - "//window.alert('DEBUG GALT TEST');\n" - "//window.alert('url='+url+' trackName='+trackName+' trackDescription='+trackDescription);\n" "\n" "buildBigPslCt(url, trackName, trackDescription);\n" - "//window.alert('result ct_blat = '+ ct_blat);\n" "if (luckyLocation !== '')\n" " {\n" - " //window.alert('luckyLocation = ' + luckyLocation);\n" " location.replace(luckyLocation);\n" " }\n" "else\n" " {\n" " $('#renameFormItem')[0].style.display = 'block';\n" " $('#deleteCtForm')[0].style.display = 'block';\n" " }\n" "});\n", url->string, trackName, trackDescription); // RENAME CT JS CODE if (!feelingLucky) jsInline("$('#showRenameForm').click(function(){\n" " $('#renameForm')[0].style.display = 'block';\n" " $('#renameFormItem')[0].style.display = 'none';\n" " $('#showRenameForm')[0].style.display = 'none';\n" " $('input[name=\"trackName\"]')[0].value = trackName;\n" " $('input[name=\"trackDescription\"]')[0].value = trackDescription;\n" "return false;\n" "});\n"); // RENAME CT JS CODE if (!feelingLucky) jsInline("$('#submitTrackNameDescr').click(function(){\n" - "//window.alert('DEBUG GALT TEST');\n" " $('#renameForm')[0].style.display = 'none';\n" " $('#renameFormItem')[0].style.display = 'block';\n" " $('#showRenameForm')[0].style.display = 'block';\n" " trackName = $('input[name=\"trackName\"]')[0].value;\n" " trackDescription = $('input[name=\"trackDescription\"]')[0].value;\n" "buildBigPslCt(url, trackName, trackDescription);\n" "return false;\n" "});\n"); dyStringFree(&url); } else if (useBigPsl) {