18ef76d32c407a89bc0d7d8fd329d735c79eef1a
max
Tue Jun 30 17:35:58 2026 -0700
Revert "hgBlat: fix bugs in showAliPlaces BLAT results page"
This reverts commit 099dda2013e7caffde097371fa68de467a2c5085.
diff --git src/hg/hgBlat/hgBlat.c src/hg/hgBlat/hgBlat.c
index bbed0916c9e..2c58ecc9795 100644
--- src/hg/hgBlat/hgBlat.c
+++ src/hg/hgBlat/hgBlat.c
@@ -539,30 +539,31 @@
cartWebEnd();
}
}
else if (pslOut)
{
if (!pslRawOut)
printf("");
if (!sameString(output, "psl no header"))
pslxWriteHead(stdout, qType, tType);
for (psl = pslList; psl != NULL; psl = psl->next)
pslTabOut(psl, stdout);
if (pslRawOut)
exit(0);
+ printf("");
printf("");
}
else if (jsonOut)
{
webStartText();
pslWriteAllJson(pslList, stdout, database, TRUE);
exit(0);
}
else // hyperlink
{
printf("BLAT Search Results
");
char* posStr = cartOptionalString(cart, "position");
if (posStr != NULL)
printf("Go back to %s on the Genome Browser.
\n", browserUrl, posStr);
@@ -635,60 +636,58 @@
}
if (!feelingLucky)
{
// REMOVE CT BUTTON FORM.
printf("\n");
printf("\n");
printf("
\n");
}
- char *trackNameJs = javaScriptLiteralEncode(trackName);
- char *trackDescriptionJs = javaScriptLiteralEncode(trackDescription);
jsInlineF(
"var ct_blat = '';\n"
"\n"
"function buildBigPslCtSuccess (content, status)\n"
"{ // Finishes the successful 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"
"\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"
" 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"
+ "if (!ct_blat !== '')\n"
" {\n"
" cgiVars += '&"CT_DO_REMOVE_VAR"='+encodeURIComponent('Remove Custom Track');\n"
" cgiVars += '&"CT_SELECTED_TABLE_VAR"='+encodeURIComponent(ct_blat);\n"
" }\n"
"\n"
"$.ajax({\n"
" type: 'GET',\n"
" url: url,\n"
" data: cgiVars,\n"
" dataType: 'html',\n"
" trueSuccess: buildBigPslCtSuccess,\n"
" success: catchErrorOrDispatch,\n"
" error: errorHandler,\n"
" cache: false,\n"
" async: false\n"
@@ -698,33 +697,31 @@
"var url='%s';\n"
"var trackName='%s';\n"
"var trackDescription='%s';\n"
"$(document).ready(function() {\n"
"\n"
"buildBigPslCt(url, trackName, trackDescription);\n"
"if (luckyLocation !== '')\n"
" {\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, trackNameJs, trackDescriptionJs);
- freeMem(trackNameJs);
- freeMem(trackDescriptionJs);
+ "});\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)
@@ -907,33 +904,30 @@
psl->tEnd - psl->tStart);
// if you modify this, also modify hgPcr.c:doQuery, which implements a similar feature
char *seq = psl->tName;
if (endsWith(seq, "_fix"))
printf(" What is chrom_fix?");
else if (endsWith(seq, "_alt"))
printf(" What is chrom_alt?");
else if (endsWith(seq, "_random"))
printf(" What is chrom_random?");
else if (startsWith(seq, "chrUn"))
printf(" What is a chrUn sequence?");
printf("\n");
}
printf("\n");
- if (locusConn != NULL)
- hFreeConn(&locusConn);
- subTextFreeList(&subList);
webNewSection("Help");
puts("
Missing a match?
");
puts("What is chr_alt & chr_fix?
\n");
puts("\n");
}
pslFreeList(&pslList);
}
void trimUniq(bioSeq *seqList)
/* Check that all seq's in list have a unique name. Try and
* abbreviate longer sequence names. */
{
struct hash *hash = newHash(0);
bioSeq *seq;