83043aefb8f67b37febbf9a9db14eff3ed7efc4c galt Thu Jul 17 11:23:35 2014 -0700 fix relative links diff --git src/hg/qaPushQ/qaPushQ.c src/hg/qaPushQ/qaPushQ.c index e5efcdb..60386f1 100644 --- src/hg/qaPushQ/qaPushQ.c +++ src/hg/qaPushQ/qaPushQ.c @@ -583,31 +583,31 @@ if (isNew) { replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", "  "); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); safef(tempLink, sizeof(tempLink), - "CANCEL  ",newRandState); + "CANCEL  ",newRandState); replaceInStr(html, sizeof(html), "", tempLink ); showSizesJavascript(); } else { if (myLock) { replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", "  "); replaceInStr(html, sizeof(html), "" , @@ -649,35 +649,35 @@ showSizesJavascript(); } else { /* we don't have a lock yet, disable and readonly */ replaceInStr(html, sizeof(html), "", "DISABLED"); replaceInStr(html, sizeof(html), "", "READONLY"); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", "  "); safef(tempLink, sizeof(tempLink), - "RETURN  ",newRandState); + "RETURN  ",newRandState); replaceInStr(html, sizeof(html), "", tempLink ); safef(tempLink, sizeof(tempLink), - "REFRESH  ", + "REFRESH  ", ki->qid,newRandState); replaceInStr(html, sizeof(html), "", tempLink ); replaceInStr(html, sizeof(html), "", ""); replaceInStr(html, sizeof(html), "", ""); if (sameString(ki->lockUser,"")) { safef(tempMsg,sizeof(tempMsg),"%s %s", msg, "READONLY view. Press Lock to edit. Click RETURN for the main queue."); } else { safef(tempMsg,sizeof(tempMsg),"%s User %s currently has lock on Queue Id %s since %s.", msg, ki->lockUser, ki->qid,ki->lockDateTime ); } safef(msg,sizeof(msg), "%s", tempMsg); @@ -770,59 +770,59 @@ } char *fixLineBreaks(char *s) /* insert
before \n to have an effect inside html */ { return replaceChars(s,"\n","
\n"); } void drawDisplayLine(enum colEnum col, struct pushQ *ki) { char *temp = NULL; switch(col) { case e_qid: - printf("%s%s", + printf("%s%s", ki->qid, newRandState, ki->qid, sameString(ki->lockUser,"") ? "":"*" ); if (ki->pushState[0]=='Y') { - printf("
Done!", + printf("
Done!", ki->qid, newRandState ); } printf("\n"); break; case e_pqid: printf("%s\n", ki->pqid ); break; case e_priority: if (ki->priority[0] == 'L') { printf("%s", ki->priority); } else { printf( "
%s" - "^  " - "T  " + "^  " + "T  " "
 " - "v  " - "B" + "v  " + "B" "
\n", ki->priority, ki->qid, newRandState, ki->qid, newRandState, ki->qid, newRandState, ki->qid, newRandState ); } break; case e_rank: printf("%d\n", ki->rank ); break; case e_qadate: @@ -1010,50 +1010,50 @@ slCount(kiList) */ if (sameString(utsName.nodename,"hgwdev")) { printf("

Machine: %s THIS IS NOT THE REAL PUSHQ- GO TO HGWBETA

\n",utsName.nodename); } if (!sameString(msg,"")) { printf("

%s

\n",msg); } if (sameString(month,"")) { - printf(" ADD\n",newRandState); + printf(" ADD\n",newRandState); } else { - printf(" Current\n",newRandState); - } -printf(" Logout\n",newRandState); -printf(" All Columns\n",newRandState); -printf(" Default Columns\n",newRandState); -printf(" Log by Month\n",newRandState); -printf(" Gateway\n",newRandState); -printf(" Help\n"); -printf(" Release Log\n"); -//printf(" Publish RL\n"); -printf(" A\n",newRandState); -printf(" B\n",newRandState); -printf(" C\n",newRandState); -printf(" D\n",newRandState); -printf(" L\n",newRandState); -printf(" Refresh\n",newRandState); + printf(" Current\n",newRandState); + } +printf(" Logout\n",newRandState); +printf(" All Columns\n",newRandState); +printf(" Default Columns\n",newRandState); +printf(" Log by Month\n",newRandState); +printf(" Gateway\n",newRandState); +printf(" Help\n"); +printf(" Release Log\n"); +//printf(" Publish RL\n"); +printf(" A\n",newRandState); +printf(" B\n",newRandState); +printf(" C\n",newRandState); +printf(" D\n",newRandState); +printf(" L\n",newRandState); +printf(" Refresh\n",newRandState); //printf(" newRandState=%s\n",newRandState); //printf(" oldRandState=%s\n",oldRandState); /* draw table header */ printf("

Track Push Queue"); if (!sameString(pushQtbl,"pushQ")) { printf(" for %s",pushQtbl); } if (!sameString(month,"")) { printf(" (%s)",month); } printf("

\n"); @@ -2232,49 +2232,49 @@ XdoPromoteColumn(-1); } void doShowAllColumns() /* Display hidden columns available for resurrection */ { int c = 0; char templist[512]; char tempe[64]; printf("

Show Hidden Columns

\n"); printf("
\n"); -printf("RETURN
", newRandState); +printf("RETURN
", newRandState); printf("
\n"); printf("Click on any column below to un-hide it.
\n"); printf("
\n"); safef(templist,sizeof(templist),",%s,",showColumns); /* add sentinel comma values to the ends of the col list */ for (c=0; c%s

", + printf("%s

", colName[c], newRandState, colName[c]); } } printf("
\n"); -printf("RETURN
", newRandState); +printf("RETURN
", newRandState); } void doShowColumn() /* Make column visible again */ { struct dyString * s = NULL; char *colName = NULL; char templist[512]; char tempe[64]; s = newDyString(2048); /* need room */ colName = cgiString("colName"); @@ -2313,31 +2313,31 @@ char query[256]; printf("

Logs for Month

\n"); printf("
\n"); printf("Current
\n", newRandState); printf("
\n"); sqlSafef(query, sizeof(query), "select distinct substring(qadate,1,7) from %s where priority='L' order by qadate desc",pushQtbl); sr = sqlGetResult(conn, query); while ((row = sqlNextRow(sr)) != NULL) { printf("%s
\n",row[0],newRandState,row[0]); } sqlFreeResult(&sr); printf("
\n"); -printf("RETURN
", newRandState); +printf("RETURN
", newRandState); } void getIndexes(struct sqlConnection *conn, char *tbl, char *s, int ssize) /* Get indexes with show index on table command. Return -1 if err. * Will match multiple if "%" used in tbl */ { char query[256]; char **row; struct sqlResult *sr; char *fld = NULL; int f = 0, i = 0, n = 0, c = 0; char lastKeyName[256]=""; @@ -2989,38 +2989,38 @@ void doTransfer() /* Present choice of queues to which the selected and locked record may be transferred */ { struct pushQ *q; char newQid[sizeof(q->qid)] = ""; char tempUrl[256]; ZeroVar(&q); safef(newQid, sizeof(newQid), "%s", cgiString("qid")); printf("

Transfer Queue Entry %s:%s to Another Queue

\n", pushQtbl, newQid); q=mustLoadPushQ(newQid); -printf("RETURN \n",newQid,newRandState); +printf("RETURN \n",newQid,newRandState); printf("
\n"); printf("
\n"); safef(tempUrl, sizeof(tempUrl), "action=transferTo&qid=%s&toOrg", newQid); listQueues(tempUrl, TRUE); -printf("RETURN
\n",newQid,newRandState); +printf("RETURN
\n",newQid,newRandState); pushQFree(&q); } void doTransferTo() /* Execute transfer of qid from current pushQtbl to named target Q table */ { struct pushQ *q; int updateSize = 2456; /* almost anything works here */ char *toOrg = cgiString("toOrg"); /* required cgi var */ char *origQid = NULL; int newqid = 0; char newQid [sizeof(q->qid)] = ""; char *savePushQtbl = cloneString(pushQtbl); char query[256]; @@ -3245,31 +3245,31 @@ } } sqlFreeResult(&sr); printf("
\n"); } void doShowGateway() /* This gives the user a choice of queues to use */ { printf("

Gateway - Choose Queue

\n"); printf("
\n"); listQueues("org", FALSE); -printf("RETURN
\n",newRandState); +printf("RETURN
\n",newRandState); } void doUnlock() /* currently a backdoor for logged-in users to unlock a record */ { struct pushQ *q; int updateSize = 2456; /* almost anything works here */ q = mustLoadPushQ(cgiString("qid")); /* required cgi var */ /* unlock record */ safef(q->lockUser, sizeof(q->lockUser), "%s",""); safef(q->lockDateTime, sizeof(q->lockDateTime), "%s",""); /* update existing record */ @@ -3383,34 +3383,34 @@ /* regular log index #links */ for (ki = kiList; ki != NULL; ki = ki->next) { safef(tempName, sizeof(tempName), "%s", ki->organism); if (!sameString(ki->organism, ki->genome)) { safef(tempName,sizeof(tempName),"%s",ki->genome); } printf("
  • %s %s (%s)
  • \n", ki->name,tempName,ki->description,ki->name); } printf("\n"); printf("

    \n"); printf(" For more information about the tracks and tables listed on this page, refer to the " -"User's Guide.

    \n"); +"User's Guide.

    \n"); strftime (now, sizeof(now), "%02d %b %Y", loctime); /* default to today's date */ -printf("Last updated %s. Inquiries and feedback welcome.\n",now); +printf("Last updated %s. Inquiries and feedback welcome.\n",now); /* 10 LATEST CHANGES */ webNewSection(" 10 Latest Changes (all assemblies)"); printf("\n" "\n" "\n" "\n" "\n" "\n" ); sqlSafef(query,sizeof(query), "select releaseLog, dbs, qadate, releaseLogUrl from pushQ " "where priority='L' and releaseLog != '' and dbs != '' %-s" "order by qadate desc, qid desc ", encodeClause );
    Track/Table NameAssemblyRelease Date