46a7db400ddc1280555e0bc32ed09311e19efc65 chmalee Thu May 7 10:53:58 2026 -0700 Reword some hubSpace assembly hub error message. Make the duration of some error message notifications longer, change some text around input about why certain inputs are disabled in certain situations, refs #37411 diff --git src/hg/hgHubConnect/hooks/pre-create.c src/hg/hgHubConnect/hooks/pre-create.c index 7cc7cc11b51..78303754b89 100644 --- src/hg/hgHubConnect/hooks/pre-create.c +++ src/hg/hgHubConnect/hooks/pre-create.c @@ -122,35 +122,31 @@ errAbort("File type '%s' for file '%s' is not accepted at this time", reqFileType, reqFileName); } char *reqGenome = jsonQueryString(req, "", "Event.Upload.MetaData.genome", NULL); if (!reqGenome) { errAbort("Genome selection is NULL for file '%s' is invalid. Please choose the correct genome", reqFileName); } // Block 2bit uploads whose genome name collides with a UCSC native database or GenArk hub. if (sameOk(reqFileType, "2bit") && reqGenome[0] && (hDbExists(reqGenome) || isGenArk(reqGenome))) { char *hubName = reqParentDir ? hubNameFromPath(reqParentDir) : ""; char *existingHubType = existingHubTypeForDir(userName, hubName); if (!sameOk(existingHubType, "assemblyHub")) - errAbort("Genome name '%s' collides with a UCSC native assembly or GenArk hub. " - "hgTracks would load the UCSC assembly instead of your 2bit. " - "Open the file card and pick a different name for your " - "assembly (e.g. '%s_hub') in the Genome field.", - reqGenome, reqGenome); + errAbort(HUB_GENOME_COLLISION_ERR_FMT, reqGenome, reqGenome); } // we've passed all the checks so we can return that we are good to upload the file if (exitStatus == 0) { // set the location of the upload to the location it will ultimately live char *location = setUploadPath(userName, reqFileName, reqParentDir, forceOverwrite); if (!location) { errAbort("Error setting upload path in pre-create for file '%s'. This is an" " issue with our server, please email genome-www@soe.ucsc.edu with your" " userName so we can investigate.", reqFileName); } struct hash *changeObjHash = hashNew(0); struct hash *pathObjHash = hashNew(0);