110f5e12a634db49ea9aa1ea23ff4965f1c2befe galt Tue Aug 14 13:48:57 2018 -0700 changing cse to soe in domains, sometimes gi. ref #21876 diff --git src/hg/qaPushQ/qaPushQ.c src/hg/qaPushQ/qaPushQ.c index 33ec08f..5617cea 100644 --- src/hg/qaPushQ/qaPushQ.c +++ src/hg/qaPushQ/qaPushQ.c @@ -509,31 +509,31 @@ } /* -------------------- Push Queue ----------------------- */ void showSizesJavascript() /* set showSizes for cross-posting to support file sizes */ { char sizesButton[1024]; safef(sizesButton, sizeof(sizesButton), " <input TYPE=SUBMIT NAME=\"showSizes\" VALUE=\"Show Sizes\"" " ONCLICK=\"if (document.forms[0].currLoc.value!='%s') {" " document.forms[0]._action.value='xpost';" - " document.forms[0].action='http://%s.cse.ucsc.edu/cgi-bin/qaPushQ';" + " document.forms[0].action='http://%s.soe.ucsc.edu/cgi-bin/qaPushQ';" "};return true;\">" , utsName.nodename , sameString(utsName.nodename, "hgwdev") ? "hgwbeta" : "hgwdev" ); replaceInStr(html, sizeof(html), "<!sizesbutton>", sizesButton); } void replacePushQFields(struct pushQ *ki, bool isNew) /* fill in dummy html tags with values from the sql pushQ record */ { char tempLink[256]; char tempSizeMB[256]; char tempMsg[256]; bool myLock = FALSE; @@ -1000,31 +1000,31 @@ while ((row = sqlNextRow(sr)) != NULL) { ki = pushQLoad(row); slAddHead(&kiList, ki); } dyStringFree(&dy); sqlFreeResult(&sr); slReverse(&kiList); /* #rows returned slCount(kiList) */ if (sameString(utsName.nodename,"hgwdev")) { - printf("<p style=\"color:red\">Machine: %s THIS IS NOT THE REAL PUSHQ- GO TO <a href=http://hgwbeta.cse.ucsc.edu/cgi-bin/qaPushQ>HGWBETA</a> </p>\n",utsName.nodename); + printf("<p style=\"color:red\">Machine: %s THIS IS NOT THE REAL PUSHQ- GO TO <a href=http://hgwbeta.soe.ucsc.edu/cgi-bin/qaPushQ>HGWBETA</a> </p>\n",utsName.nodename); } if (!sameString(msg,"")) { printf("<p style=\"color:red\">%s</p>\n",msg); } if (sameString(month,"")) { printf(" <A href=qaPushQ?action=add&cb=%s>ADD</A>\n",newRandState); } else { printf(" <A href=qaPushQ?action=display&month=current&cb=%s>Current</A>\n",newRandState); } @@ -1913,60 +1913,60 @@ printf("<TR>\n"); printf("<TD align=right>\n"); printf(" \n"); printf("</TD>\n"); printf("<TD>\n"); printf("<input TYPE=SUBMIT NAME=\"submit\" VALUE=\"Log In\">\n"); printf("</TD>\n"); printf("</TR>\n"); printf("</TABLE>\n"); if (sameString(utsName.nodename,"hgwdev")) { printf("<br><p style=\"color:red\">Machine: %s THIS IS NOT THE REAL PUSHQ- GO TO " - "<a href=http://hgwbeta.cse.ucsc.edu/cgi-bin/qaPushQ>HGWBETA</a> </p>\n",utsName.nodename); + "<a href=http://hgwbeta.soe.ucsc.edu/cgi-bin/qaPushQ>HGWBETA</a> </p>\n",utsName.nodename); } printf("</FORM>\n"); printf("<br>\n"); printf("%s<br>\n",msg); } void doLogoutMsg() /* let user know logged-out ok */ { printf("<h4>Logged Out</h4>\n"); printf("<FORM ACTION=\"/cgi-bin/qaPushQ\" NAME=\"logoutForm\" METHOD=\"POST\">\n"); printf("<input TYPE=\"hidden\" NAME=\"action\" VALUE=\"login\" >\n"); printf("<TABLE cellpadding=6>\n"); printf("<TR>\n"); printf("<TD align=right>\n"); printf("<input TYPE=SUBMIT NAME=\"submit\" VALUE=\"Re-Login\">\n"); printf("</TD>\n"); printf("</TR>\n"); printf("</TABLE>\n"); printf("</FORM>\n"); } void doCookieReset() /* reset cookie, will cause new login next time */ { -htmlSetCookie("qapushq", "", NULL, NULL, ".cse.ucsc.edu", FALSE); +htmlSetCookie("qapushq", "", NULL, NULL, ".soe.ucsc.edu", FALSE); htmShell(TITLE, doLogoutMsg, NULL); } bool readAUser(struct users *u, bool optional) /* read data for my user */ { char query[256]; char **row; struct sqlResult *sr; sqlSafef(query, sizeof(query), "select * from users where user = '%s'",u->user); sr = sqlGetResult(conn, query); @@ -2095,31 +2095,31 @@ if (checkPWD(userPassword, u.password)) { /* good pwd, save user in cookie */ loginOK = TRUE; } else { /* bad pwd */ safef(msg,sizeof(msg),"Invalid user or password."); } } } if (loginOK) { /* try to make same cookie work with both hgwdev and hgwbeta to obviate need for double-login */ /* note: for permanent cookie, set NULL to expire in format "Wdy, DD-Mon-YYYY HH:MM:SS GMT" (must be GMT) */ - htmlSetCookie("qapushq", u.user, NULL, NULL, ".cse.ucsc.edu", FALSE); + htmlSetCookie("qapushq", u.user, NULL, NULL, ".soe.ucsc.edu", FALSE); qaUser=u.user; oldRandState=""; showColumns=cloneString(defaultColumns); readMyUser(); oldRandState=""; saveMyUser(); safef(msg, sizeof(msg),"Login successful."); htmShellWithHead(TITLE, meta, doMsg ,NULL); /* this is now the only redirect */ } else { htmShell(TITLE, doLogin, NULL); } @@ -2595,31 +2595,31 @@ char pathName[1024]; char filePath[1024]; char fileName[1024]; char *found=NULL; struct fileInfo *fi = NULL; char *crossUrl = ""; safef(newQid, sizeof(newQid), "%s", cgiString("qid")); printf("<H2>Show File Sizes </H2>\n"); q = mustLoadPushQ(newQid); if (crossPost) // support showSizes across machines { - crossUrl = sameString(utsName.nodename, "hgwdev") ? "http://hgwbeta.cse.ucsc.edu" : "http://hgwdev.cse.ucsc.edu"; + crossUrl = sameString(utsName.nodename, "hgwdev") ? "http://hgwbeta.soe.ucsc.edu" : "http://hgwdev.soe.ucsc.edu"; } printf("<a href=\"%s/cgi-bin/qaPushQ?action=showSizesHelp&qid=%s&cb=%s\" target=\"_blank\">HELP</a> \n", crossUrl,q->qid,newRandState); printf("<a href=\"%s/cgi-bin/qaPushQ?action=edit&qid=%s&cb=%s\">RETURN</a> \n",crossUrl,newQid,newRandState); printf(" <br>\n"); printf("Location: %s <br>\n",q->currLoc); printf("Database: %s <br>\n",q->dbs ); /* deemed too verbose: */ //printf(" Tables: %s <br>\n",q->tbls ); //printf(" CGIs: %s <br>\n",q->cgis ); //printf(" Files: %s <br>\n",q->files ); cutParens(q->dbs); cutParens(q->tbls); @@ -3133,31 +3133,31 @@ printf("<br>\n"); printf("Initial submission - displays date automatically generated when push queue record is created.<br>\n"); printf("Importance - from Redmine.<br>\n"); printf("Date Opened - date QA (re)opened. (YYYY-MM-DD) Defaults originally to current date to save typing.<br>\n"); printf("New track? - choose Y if this is a new track (i.e. has never before appeared on beta).<br>\n"); printf("Track - enter the track name as it will appear in the genome browser (use the shortLabel).<br>\n"); printf("Release Log- enter the short Label (usually) followed by notes in parentheses if any. This appears in the release log unless empty.<br>\n"); printf("Databases - enter db name. May be comma-separated list if more than one organism, etc.<br>\n"); printf("Tables - enter as comma-separated list all tables that apply. They must exist in the database specified. Wildcard * supported. (Put comments in parentheses).<br>\n"); printf("CGIs - enter names of any new cgis that are applicable. Must be found on hgwbeta.<br>\n"); printf("Files - enter pathnames of any additional files if needed.<br>\n"); printf("Size(MB) - enter the size of the total push in megabytes (MB).<br>\n"); printf("Show Sizes button - click to see a complete list of sizes of all tables and cgis. Tables are relative to Current Location specified.<br>\n"); printf("Current Location - chooose the current location of the files. Should default to hgwdev at start, after sudo mypush to hgwbeta, change this to hgwbeta.<br>\n"); printf("Makedoc verified? - choose Y if you have verified the MakeAssembly.doc in kent/src/hg/makeDb.<br>\n"); -printf("Online help - enter status of online help. Verify <a href=http://hgwbeta.cse.ucsc.edu/goldenPath/help/hgTracksHelp.html#IndivTracks>hgTracksHelp</a><br>\n"); +printf("Online help - enter status of online help. Verify <a href=http://hgwbeta.soe.ucsc.edu/goldenPath/help/hgTracksHelp.html#IndivTracks>hgTracksHelp</a><br>\n"); printf("Index verified? - choose Y if the index has been verified. Use the ShowSizes button for a quick view.<br>\n"); printf("All.joiner verified? - choose Y if the all.joiner in /hg/makeDb/schema has been verified.<br>\n"); printf("Status - enter current status (255 char max). Put long notes in Open Issues or Notes.<br>\n"); printf("Sponsor - usually the developer.<br>\n"); printf("Reviewer - usually the QA person handling the push queue for the track.<br>\n"); printf("External Source or Collaborator - external contact outside our staff that may be involved.<br>\n"); printf("Open Issues - Record any remaining open issues that are not completely resolved (no size limit here).<br>\n"); printf("Notes - Any other notes you would like to make (no size limit here).<br>\n"); printf("<br>\n"); printf("Submit button - save changes and return to main display.<br>\n"); printf("delete button - delete this push queue record and return to main display.<br>\n"); printf("push requested button - press only if you are QA staff and about to submit the push-request. It will try to verify that required entries are present.<br>\n"); printf("clone button - press if you wish to split the original push queue record into multiple parts. Saves typing, used rarely.<br>\n"); printf("bounce button - press to bounce from priority A, the QA queue, to B, the developer queue if it needs developer attention.<br>\n"); printf("transfer button - press to transfer the pushQ entry to another queue.<br>\n"); @@ -3601,31 +3601,31 @@ { char *org = NULL; /* changes pushQtbl */ char *newmonth = NULL; /* changes month */ char *temp = NULL; char *reqRandState = NULL; /* debug * safef(msg,sizeof(msg),"db='%s', host='%s', user='%s', password='%s' <br>\n",database,host,user,password); htmShell("Push Queue debug", doMsg, NULL); exit(0); */ if (crossPost) // support showSizes across machines { - //host = sameString(utsName.nodename, "hgwdev") ? "hgwbeta.cse.ucsc.edu" : "hgwdev.cse.ucsc.edu"; + //host = sameString(utsName.nodename, "hgwdev") ? "hgwbeta.soe.ucsc.edu" : "hgwdev.soe.ucsc.edu"; host = cfgOption("pq.crossHost"); } newRandState = randDigits(20); conn = sqlConnectRemote(host, user, password, database); setLock(); /* default columns */ showColumns = cloneString(defaultColumns); readMyUser(); org = cgiUsualString("org",""); /* get org, defaults to display of main push queue */