110f5e12a634db49ea9aa1ea23ff4965f1c2befe galt Tue Aug 14 13:48:57 2018 -0700 changing cse to soe in domains, sometimes gi. ref #21876 diff --git src/hg/lib/fileUi.c src/hg/lib/fileUi.c index eebda50..21f0d03 100644 --- src/hg/lib/fileUi.c +++ src/hg/lib/fileUi.c @@ -132,32 +132,32 @@ if (fileDbBackupAvailable(db, dir, subDir)) // check backup first foundFiles = fileDbReadFromBackup(db, dir, subDir); else #endif///def CACHE_IS_FASTER_THAN_RSYNC { FILE *scriptOutput = NULL; char buf[1024]; char cmd[512]; char *words[10]; char *server = hDownloadsServer(); // Always uses rsync, even when same server, to ensure testability if (hIsBetaHost()) { // NOTE: Force this case because beta may think it's downloads server is - // "hgdownload.cse.ucsc.edu" - safef(cmd,sizeof(cmd),"rsync -n rsync://hgdownload-test.cse.ucsc.edu/goldenPath/" + // "hgdownload.soe.ucsc.edu" + safef(cmd,sizeof(cmd),"rsync -n rsync://hgdownload-test.soe.ucsc.edu/goldenPath/" "%s/%s/%s/beta/", db, dir, subDir); } else safef(cmd,sizeof(cmd),"rsync -n rsync://%s/goldenPath/%s/%s/%s/", server, db, dir, subDir); scriptOutput = popen(cmd, "r"); while (fgets(buf, sizeof(buf), scriptOutput)) { eraseTrailingSpaces(buf); if (!endsWith(buf,".md5sum")) // Just ignore these { int count = chopLine(buf, words); if (count == 5) { @@ -593,32 +593,32 @@ jsIncludeFile("ddcl.js",NULL); } dyStringFree(&dyFilters); } return filterableBits; } static void filesDownloadsPreamble(char *db, struct trackDb *tdb, boolean isUnrestricted) // Replacement for preamble.html which should expose parent dir, files.txt and supplemental, but // not have any specialized notes per composite. Specialized notes belong in track description. { char *server = hDownloadsServer(); char *subDir = ""; if (hIsBetaHost()) { - server = "hgdownload-test.cse.ucsc.edu"; // NOTE: Force this case because beta may think - subDir = "/beta"; // it's downloads server is "hgdownload.cse.ucsc.edu" + server = "hgdownload-test.soe.ucsc.edu"; // NOTE: Force this case because beta may think + subDir = "/beta"; // it's downloads server is "hgdownload.soe.ucsc.edu" } if (!isUnrestricted) { cgiDown(0.9); puts("<B>Data is <A HREF='../ENCODE/terms.html' TARGET='_BLANK'>RESTRICTED FROM USE</a>"); puts("in publication until the restriction date noted for the given data file.</B>"); } cgiDown(0.7); puts("Additional resources:"); printf("<BR>• <B><A HREF='http://%s/goldenPath/%s/%s/%s%s/files.txt' " "TARGET=ucscDownloads>files.txt</A></B> - lists the name and metadata for each download.\n", server,db,ENCODE_DCC_DOWNLOADS, tdb->track, subDir); printf("<BR>• <B><A HREF='http://%s/goldenPath/%s/%s/%s%s/md5sum.txt' " "TARGET=ucscDownloads>md5sum.txt</A></B> - lists the md5sum output for each download.\n", server,db,ENCODE_DCC_DOWNLOADS, tdb->track, subDir); @@ -688,32 +688,32 @@ else #endif///defn INCLUDE_FILENAMES { printf("<TH class='sortable sort%d' nowrap>File Name</TH>\n",++curOrder); columnCount++; } printf("<TH class='sortable sort%d' align='left' nowrap>Additional Details</TH>\n",++curOrder); columnCount++; printf("</TR></THEAD>\n"); // Now the files... char *server = hDownloadsServer(); char *subDir = ""; if (hIsBetaHost()) { - server = "hgdownload-test.cse.ucsc.edu"; // NOTE: Force this case because beta may think - subDir = "/beta"; // it's downloads server is "hgdownload.cse.ucsc.edu" + server = "hgdownload-test.soe.ucsc.edu"; // NOTE: Force this case because beta may think + subDir = "/beta"; // it's downloads server is "hgdownload.soe.ucsc.edu" } struct fileDb *oneFile = fileList; printf("<TBODY class='sortable sorting'>\n"); // 'sorting' is a fib but it conveniently greys if (timeIt) // the list till the table is initialized. uglyTime("Finished column headers"); for (;oneFile!= NULL;oneFile=oneFile->next) { oneFile->mdb->next = NULL; // mdbs were in list for generating sortOrder, char *field = NULL; // but list no longer needed printf("<TR valign='top'%s>",(filterable != 0) ?" class='filterable'":""); // Download button printf("<TD nowrap>"); if (parentTdb) field = parentTdb->track;