2db476e7f26a056f0a31ecd0ff8801d75e404a29 max Wed Jul 27 12:12:47 2016 -0700 changing meaning of ${ and $}, as suggested by Galt. Having some feeling this was used somewhere, but cannot find where right now. refs #17785 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index ff31a2b..7ccc809 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -8536,40 +8536,34 @@ if (nextColon) /* terminate suffixClone suffix */ *nextColon = '\0'; /* when next colon is present */ *suffix = '\0'; /* terminate itemClone prefix */ outs[7] = itemClone; outs[8] = suffixClone; /* small memory leak here for these cloned strings */ /* not important for a one-time operation in a CGI that will exit */ } else { outs[7] = idInUrl; /* otherwise, these are not expected */ outs[8] = idInUrl; /* to be used */ } // URL may now contain item boundaries ins[9] = "${"; ins[10] = "$}"; -// This code is using l and r which are the coordinates of the window, -// so it does not work right for hgc item boundaries at this time. -// For hgc, it should use cart vars o and t. -// For hgGene (in future?) it should use hgg_start and hgg_end. -// For hgTracks, I do not know if it needs this feature or which cart vars it should use. -// Can somebody (maybe Max) review and fix this? -if (cartOptionalString(cart, "l") && cartOptionalString(cart, "r")) - { - int itemBeg = cartIntExp(cart, "l"); // Should strip any unexpected commas - int itemEnd = cartIntExp(cart, "r"); +if (cartOptionalString(cart, "o") && cartOptionalString(cart, "t")) + { + int itemBeg = cartIntExp(cart, "o"); // Should strip any unexpected commas + int itemEnd = cartIntExp(cart, "t"); safef(begItem, sizeof begItem, "%d", itemBeg); safef(endItem, sizeof endItem, "%d", itemEnd); outs[9] = begItem; outs[10] = endItem; } else // should never be but I am unwilling to bet the farm { outs[9] = startString; outs[10] = endString; } ins[11] = "$n"; outs[11] = scName; ins[12] = "$taxId";