2f593f97e515fe80e77f67b5b933074678b448a6 tdreszer Mon Jul 23 16:36:53 2012 -0700 Making final pass through tree of checkins as dictated by Jim. None of these changes should affect executables in any way. This pass is due to expanding fingerprint caused by kompare. diff --git src/hg/qaPushQ/qaPushQ.c src/hg/qaPushQ/qaPushQ.c index 1763111..19585f1 100644 --- src/hg/qaPushQ/qaPushQ.c +++ src/hg/qaPushQ/qaPushQ.c @@ -597,59 +597,52 @@ replaceInStr(html, sizeof(html), "<!cancellink>", tempLink ); showSizesJavascript(); } else { if (myLock) { replaceInStr(html, sizeof(html), "<!DISABLED>", ""); replaceInStr(html, sizeof(html), "<!READONLY>", ""); replaceInStr(html, sizeof(html), "<!submitbutton>", "<input TYPE=SUBMIT NAME=\"submit\" VALUE=\"Submit\" > "); replaceInStr(html, sizeof(html), "<!delbutton>" , - "<input TYPE=SUBMIT NAME=\"delbutton\" VALUE=\"delete\"> " - ); + "<input TYPE=SUBMIT NAME=\"delbutton\" VALUE=\"delete\"> "); if (ki->priority[0]!='L') { - replaceInStr(html, sizeof(html), - "<!pushbutton>", - "<input TYPE=SUBMIT NAME=\"pushbutton\" VALUE=\"push requested\"> " - ); + replaceInStr(html, sizeof(html), "<!pushbutton>", + "<input TYPE=SUBMIT NAME=\"pushbutton\" VALUE=\"push requested\">" + " "); } - replaceInStr(html, sizeof(html), - "<!clonebutton>", - "<input TYPE=SUBMIT NAME=\"clonebutton\" VALUE=\"clone\"> " - ); + replaceInStr(html, sizeof(html), "<!clonebutton>", + "<input TYPE=SUBMIT NAME=\"clonebutton\" VALUE=\"clone\"> "); if (ki->priority[0]=='A') { - replaceInStr(html, sizeof(html), - "<!bouncebutton>", - "<input TYPE=SUBMIT NAME=\"bouncebutton\" VALUE=\"bounce\"> " - ); + replaceInStr(html, sizeof(html), "<!bouncebutton>", + "<input TYPE=SUBMIT NAME=\"bouncebutton\" VALUE=\"bounce\"> "); } else { - replaceInStr(html, sizeof(html), - "<!bouncebutton>", - "<input TYPE=SUBMIT NAME=\"bouncebutton\" VALUE=\"unbounce\"> " - ); + replaceInStr(html, sizeof(html), "<!bouncebutton>", + "<input TYPE=SUBMIT NAME=\"bouncebutton\" VALUE=\"unbounce\">" + " "); } replaceInStr(html, sizeof(html), "<!lockbutton>", ""); replaceInStr(html, sizeof(html), "<!cancellink>", "<input TYPE=SUBMIT NAME=\"cancelbutton\" VALUE=\"Cancel\" > "); replaceInStr(html, sizeof(html), "<!refreshlink>", ""); replaceInStr(html, sizeof(html), "<!transferbutton>", "<input TYPE=SUBMIT NAME=\"transfer\" VALUE=\"Transfer\"> "); showSizesJavascript(); } @@ -1422,35 +1415,34 @@ "pqid='%s',priority='%s',rank=%u,qadate='%s',newYN='%s',track='%s',", tableName, pqid, priority, el->rank, qadate, newYN, track); dyStringPrintf(update, "dbs='%s',",dbs); dyStringPrintf(update, "tbls='%s',",tbls); dyStringPrintf(update, "cgis='%s',",cgis); dyStringPrintf(update, "files='%s',",files); dyStringPrintf(update, "sizeMB=%u,currLoc='%s'," "makeDocYN='%s',onlineHelp='%s',ndxYN='%s',joinerYN='%s',stat='%s'," "sponsor='%s',reviewer='%s',extSource='%s',", el->sizeMB , currLoc, makeDocYN, onlineHelp, ndxYN, joinerYN, stat, sponsor, reviewer, extSource); dyStringPrintf(update, "openIssues='%s',",openIssues); dyStringPrintf(update, "notes='%s',",notes); dyStringPrintf(update, "pushState='%s', initdate='%s', lastdate='%s', bounces='%u',lockUser='%s'," - "lockDateTime='%s',releaseLog='%s',featureBits='%s',releaseLogUrl='%s',importance='%s' " - "where qid='%s'", - pushState, initdate, lastdate, el->bounces, lockUser, lockDateTime, releaseLog, featureBits, releaseLogUrl, importance, - qid - ); + "lockDateTime='%s',releaseLog='%s',featureBits='%s',releaseLogUrl='%s'," + "importance='%s' where qid='%s'", + pushState, initdate, lastdate, el->bounces, lockUser, lockDateTime, + releaseLog, featureBits, releaseLogUrl, importance, qid ); sqlUpdate(conn, update->string); freeDyString(&update); freez(&qid); freez(&pqid); freez(&priority); freez(&qadate); freez(&newYN); freez(&track); freez(&dbs); freez(&tbls); freez(&cgis); freez(&files); freez(&currLoc); freez(&makeDocYN); @@ -3427,32 +3419,31 @@ { kiNext = ki->next; safef(query,sizeof(query), "select count(*) from pushQ " "where priority='L' and releaseLog != '' and (" "dbs like '%s' or " "dbs like '%s %%' or " "dbs like '%% %s' or " "dbs like '%% %s %%'" ") %s" "order by qadate desc, qid desc", ki->name, ki->name, ki->name, ki->name, - encodeClause - ); + encodeClause ); if (sqlQuickNum(conn, query) > 0) { slAddHead(&newList, ki); } } slReverse(&newList); kiList = newList; /* 10 Latest Changes */ printf("<ul>\n"); printf("<li><a CLASS=\"toc\" HREF=\"#recent\" ><b>10 Latest Changes (all assemblies)</b></a></li>"); /* regular log index #links */ for (ki = kiList; ki != NULL; ki = ki->next) { @@ -3533,70 +3524,68 @@ else { printf("<a href=\"%s\" target=_blank>%s</a>", row[3], row[0]); } printf("</td>\n"); printf("<td>%s</td>\n" "<td>%02d %s %s</td>\n" "</tr>\n", row[1], d, numberToMonth[m-1], cloneStringZ(row[2],4) ); } freez(&dbs); freeDyString(&dbList); if (topCount>=10) - {break;} + break; } } sqlFreeResult(&sr); printf("</table>\n"); /* REGULAR LOG */ for (ki = kiList; ki != NULL; ki = ki->next) { safef(tempName,sizeof(tempName),ki->organism); if (!sameString(ki->organism, ki->genome)) { safef(tempName,sizeof(tempName),"<em>%s</em>",ki->genome); } webNewSection("<A NAME=%s></A>%s %s (%s, %s)", ki->name, tempName, ki->description, ki->name, ki->sourceName); printf("<TABLE CELLPADDING=4 style='border:1px solid #aaaaaa; width:100%%;'>\n" "<TR><TD nowrap><B style='color:#006666;'>Track/Table Name</B></TD>\n" " <TD nowrap><B style='color:#006666;'>Release Date</B>\n" - "</TD></TR>\n" - ); + "</TD></TR>\n"); safef(query,sizeof(query), "select releaseLog, qadate, releaseLogUrl from pushQ " "where priority='L' and releaseLog != '' and (" "dbs like '%s' or " "dbs like '%s %%' or " "dbs like '%% %s' or " "dbs like '%% %s %%'" ") %s" "order by qadate desc, qid desc", ki->name, ki->name, ki->name, ki->name, - encodeClause - ); + encodeClause ); //printf("query=%s\n",query); sr = sqlGetResult(conn, query); while ((row = sqlNextRow(sr)) != NULL) { sscanf(cloneStringZ(&row[1][5],2),"%d",&m); sscanf(cloneStringZ(&row[1][8],2),"%d",&d); printf("<TR valign=top><TD align=left>\n"); if (sameOk(row[2], "")) { printf("%s", row[0]); } else { printf("<a href=\"%s\" target=_blank>%s</a>", row[2], row[0]);