65d4e214bd753220cd3f1b9700f107ef1ae648da chmalee Fri May 24 09:36:42 2024 -0700 Make hubSpace autoSql files, haven't created the table yet diff --git src/hg/hgHubConnect/hooks/pre-create.c src/hg/hgHubConnect/hooks/pre-create.c index b1f9c7e..00be2ad 100644 --- src/hg/hgHubConnect/hooks/pre-create.c +++ src/hg/hgHubConnect/hooks/pre-create.c @@ -59,63 +59,52 @@ struct lineFile *lf = lineFileStdin(FALSE); char *request = lineFileReadAll(lf); struct jsonElement *req = jsonParse(request); fprintf(stderr, "Hook request:\n"); jsonPrintToFile(req, NULL, stderr, 0); char *reqCookie= jsonQueryString(req, "", "Event.HTTPRequest.Header.Cookie[0]", NULL); if (reqCookie) { setenv("HTTP_COOKIE", reqCookie, 0); } fprintf(stderr, "reqCookie='%s'\n", reqCookie); char *userName = (loginSystemEnabled() || wikiLinkEnabled()) ? wikiLinkUserName() : NULL; fprintf(stderr, "userName='%s'\n'", userName); if (!userName) { - rejectUpload(response, "You are not logged in. Please navigate to My Data -> My Sessions and log in or create an account."); - exitStatus = 1; + errAbort("You are not logged in. Please navigate to My Data -> My Sessions and log in or create an account."); } else { long reqFileSize = jsonQueryInt(req, "", "Event.Upload.Size", 0, NULL); char *reqFileName = jsonQueryString(req, "", "Event.Upload.MetaData.filename", NULL); long currQuota = checkUserQuota(userName); long newQuota = currQuota + reqFileSize; long maxQuota = getMaxUserQuota(userName); if (newQuota > maxQuota) { - rejectUpload(response, "File '%s' is too large, need %s free space but current used space is %s out of %s", reqFileName, prettyFileSize(reqFileSize), prettyFileSize(currQuota), prettyFileSize(maxQuota)); - exitStatus = 1; + errAbort("File '%s' is too large, need %s free space but current used space is %s out of %s", reqFileName, prettyFileSize(reqFileSize), prettyFileSize(currQuota), prettyFileSize(maxQuota)); } char *reqFileType = jsonQueryString(req, "", "Event.Upload.MetaData.filetype", NULL); if (!isFileTypeRecognized(reqFileType)) { - rejectUpload(response, "File type '%s' for file '%s' is not accepted at this time", reqFileType, reqFileName); - exitStatus = 1; + errAbort("File type '%s' for file '%s' is not accepted at this time", reqFileType, reqFileName); } - char *reqHubName = jsonQueryString(req, "", "Event.Upload.MetaData.hub", NULL); - if (!isExistingHubForUser(userName, reqHubName)) - { - rejectUpload(response, "Hub name '%s' for file '%s' is not valid, please choose an existing hub or create a new hub", reqFileType, reqFileName); - exitStatus = 1; - } - char *hubGenome = genomeForHub(userName, reqHubName); char *reqGenome = jsonQueryString(req, "", "Event.Upload.MetaData.genome", NULL); - if (!sameString(hubGenome, reqGenome)) + if (!reqGenome) { - rejectUpload(response, "Genome selection '%s' for hub '%s' is invalid. Please choose the correct genome '%s' for hub '%s'", reqGenome, reqHubName, hubGenome, reqHubName); - exitStatus = 1; + errAbort("Genome selection '%s' for file '%s' is invalid. Please choose the correct genome", reqGenome, reqFileName); } } // we've passed all the checks so we can return that we are good to upload the file if (exitStatus == 0) fillOutHttpResponseSuccess(response); } if (errCatch->gotError) { rejectUpload(response, errCatch->message->string); exitStatus = 1; } errCatchEnd(errCatch); } // always print a response no matter what