07ec0c309cf5c4da98b99f8d2a596ea261151714 jcasper Mon Feb 27 11:04:54 2017 -0800 Cleaning up after myself, refs #18948 diff --git src/hg/lib/web.c src/hg/lib/web.c index eb822c2..5fda3b8 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -1218,55 +1218,30 @@ if (!fileExists(dyStringContents(fullDirName))) errAbort("webTimeStampedLinkToResource: dir: %s doesn't exist. (host: %s)\n", dyStringContents(fullDirName), httpHost); // build and verify real path to file struct dyString *realFileName = dyStringCreate("%s/%s", dyStringContents(fullDirName), fileName); if (!fileExists(dyStringContents(realFileName))) errAbort("webTimeStampedLinkToResource: file: %s doesn't exist.\n", dyStringContents(realFileName)); // build and verify link path including timestamp in the form of dir/baseName + timeStamp or CGI Version + ext long mtime = fileModTime(dyStringContents(realFileName)); struct dyString *linkWithTimestamp; linkWithTimestamp = dyStringCreate("%s/%s%s?v=%ld", dyStringContents(fullDirName), baseName, extension, mtime); -/* -char *scriptName = cgiScriptName(); -if (scriptName == NULL) - scriptName = cloneString(""); -boolean nonVersionedLinks = FALSE; -if (endsWith(scriptName, "qaPushQ")) - nonVersionedLinks = TRUE; -if (nonVersionedLinks) - linkWithTimestamp = dyStringCreate("%s/%s%s", dyStringContents(fullDirName), baseName, extension); -else if ((cfgOption("versionStamped") == NULL) && (hIsPreviewHost() || hIsPrivateHost())) - linkWithTimestamp = dyStringCreate("%s/%s-%ld%s", dyStringContents(fullDirName), baseName, mtime, extension); -else - linkWithTimestamp = dyStringCreate("%s/%s-v%s%s", dyStringContents(fullDirName), baseName, CGI_VERSION, extension); - -if (hIsBrowserbox() && !fileExists(dyStringContents(linkWithTimestamp))) - // on the browserbox, both alpha and beta binaries can run - { - linkWithTimestamp = dyStringCreate("%s/%s-%ld%s", dyStringContents(fullDirName), - baseName, mtime, extension); - } - -if (!fileExists(dyStringContents(linkWithTimestamp))) - errAbort("Cannot find correct version of file '%s'; this is due to an installation " - "error\n\nError details: %s does not exist", fileName, dyStringContents(linkWithTimestamp)); -*/ // Free up all that extra memory dyStringFree(&realFileName); dyStringFree(&fullDirName); char *linkFull = dyStringCannibalize(&linkWithTimestamp); char *link = linkFull; if (docRoot != NULL) { link = cloneString(linkFull + strlen(docRoot) + 1); freeMem(linkFull); } if (wrapInHtml) // wrapped for christmas { struct dyString *wrapped = dyStringNew(0);