ec74b71d82b5ee60aa2641765969e0ee86210e0c max Thu May 18 09:02:46 2017 -0700 fixing URL bug I introduced yesterday with my hgSession change. refs #19430 diff --git src/hg/hgSession/hgSession.c src/hg/hgSession/hgSession.c index a38a2a6..376d8b8 100644 --- src/hg/hgSession/hgSession.c +++ src/hg/hgSession/hgSession.c @@ -164,31 +164,31 @@ *(ptr+1) = '\0'; safef(buf, sizeof(buf), "%s%s", path, "hgTracks"); thePath = cloneString(buf); } return thePath; } void addSessionLink(struct dyString *dy, char *userName, char *sessionName, boolean encode) /* Add to dy an URL that tells hgSession to load a saved session. * If encode, cgiEncodeFull the URL. */ { struct dyString *dyTmp = dyStringNew(1024); dyStringPrintf(dyTmp, "%s%s?hgS_doOtherUser=submit&" "hgS_otherUserName=%s&hgS_otherUserSessionName=%s", - wikiServerAndCgiDir(), destAppScriptName(), userName, sessionName); + wikiServerAndCgiDir(), "hgTracks", userName, sessionName); if (encode) { dyStringPrintf(dy, "%s", cgiEncodeFull(dyTmp->string)); } else { dyStringPrintf(dy, "%s", dyTmp->string); } dyStringFree(&dyTmp); } char *getSessionLink(char *encUserName, char *encSessionName) /* Form a link that will take the user to a bookmarkable page that * will load the given session. */ { @@ -208,31 +208,31 @@ "body=Here is a UCSC browser session I%%27d like to share with " "you:%%20", cgiDecodeClone(encSessionName)); addSessionLink(dy, encUserName, encSessionName, TRUE); dyStringPrintf(dy, "\">Email\n"); return dyStringCannibalize(&dy); } void addUrlLink(struct dyString *dy, char *url, boolean encode) /* Add to dy an URL that tells hgSession to load settings from the given url. * If encode, cgiEncodeFull the whole thing. */ { struct dyString *dyTmp = dyStringNew(1024); char *encodedUrl = cgiEncodeFull(url); dyStringPrintf(dyTmp, "%s%s?hgS_doLoadUrl=submit&hgS_loadUrlName=%s", - wikiServerAndCgiDir(), destAppScriptName(), encodedUrl); + wikiServerAndCgiDir(), "hgTracks", encodedUrl); if (encode) { dyStringPrintf(dy, "%s", cgiEncodeFull(dyTmp->string)); } else { dyStringPrintf(dy, "%s", dyTmp->string); } freeMem(encodedUrl); dyStringFree(&dyTmp); } char *getUrlLink(char *url) /* Form a link that will take the user to a bookmarkable page that * will load the given url. */ @@ -595,31 +595,31 @@ "
  • Each previously saved named session also appears with " "a checkbox to add the session to our " "Public Sessions " "listing. Adding a session to this listing allows other " "browser users to view the description and a thumbnail " "image of your session, and to load the session if they " "are interested.
  • \n", cartSidUrlString(cart)); } else if (loginSystemEnabled() || wikiLinkEnabled()) { printf("
  • If you sign in, you will be able " " to save named sessions which will be displayed with " " Browser and Email links.
  • \n", wikiLinkUserLoginUrl(cartSessionId(cart))); } -dyStringPrintf(dyUrl, "%s%s", wikiServerAndCgiDir(), cgiScriptName()); +dyStringPrintf(dyUrl, "%s%s", wikiServerAndCgiDir(), "hgTracks"); printf("
  • If you have saved your settings to a local file, you can send " "email to others with the file as an attachment and direct them to " "%s .
  • \n", dyUrl->string, dyUrl->string); dyStringPrintf(dyUrl, "?hgS_doLoadUrl=submit&hgS_loadUrlName="); printf("
  • If a saved settings file is available from a web server, " "you can send email to others with a link such as " "%sU where U is the URL of your " "settings file, e.g. http://www.mysite.edu/~me/mySession.txt . " "In this type of link, you can replace " "\"hgSession\" with \"hgTracks\" in order to proceed directly to " "the Genome Browser. For an example page using such links " "please see the Session Gallery.
  • \n",