389da7069662a418d17f77728ad454c6bc34955b galt Fri Sep 15 17:55:58 2023 -0700 Revert "Fixing hgTables for redirect-to-https. Galaxy will now work correctly since we give it our URL in a vaiable of that name, now updated in galaxy.c and mainPage.c. Fixed a few minor URLs to documentation too." This reverts commit cb8c0b5aec5b78aa6693d1df261752fd3f1a6ca5. diff --git src/hg/hgTables/galaxy.c src/hg/hgTables/galaxy.c index 74f74d7..c7ae90d 100644 --- src/hg/hgTables/galaxy.c +++ src/hg/hgTables/galaxy.c @@ -92,31 +92,31 @@ void startGalaxyForm () /* start form to send parameters to Galaxy, also send required params */ { char selfUrl[256]; char *hguid = cartUserId(cart); hPrintf("<FORM ACTION=\"%s\" METHOD=POST>\n", getGalaxyUrl()); /* copy cart parameters into hidden fields to send to Galaxy */ hPrintf("\n"); /* make more readable */ /* Galaxy requires tool_id and URL */ /* set default if no tool_id for Galaxy */ if (!cartVarExists(cart, "tool_id")) cgiMakeHiddenVar("tool_id", "ucsc_table_direct1"); else cgiMakeHiddenVar("tool_id", cartString(cart, "tool_id")); -safef(selfUrl, sizeof(selfUrl), "https://%s%s", cgiServerNamePort(), cgiScriptName()); +safef(selfUrl, sizeof(selfUrl), "http://%s%s", cgiServerNamePort(), cgiScriptName()); cgiMakeHiddenVar("URL", selfUrl); hPrintf("\n"); /* forward user parameters */ if (hguid) { cgiMakeHiddenVar("hguid", hguid); hPrintf("\n"); } /* send database and organism and table for Galaxy's info */ cgiMakeHiddenVar("db", database); if (cartVarExists(cart, "org")) cgiMakeHiddenVar("org", cartString(cart, "org")); cgiMakeHiddenVar("hgta_table", curTable); cgiMakeHiddenVar(hgtaTrack, cartString(cart, hgtaTrack)); if (cartVarExists(cart, "hgta_regionType"))