0269ef320178f4be922a1bac45dc238aefbbd250 galt Thu Jun 21 19:10:04 2012 -0700 making mysql like match on space, the word-boundary in the dbs field so db wont accidentally match another db of which it is a substring diff --git src/hg/qaPushQ/qaPushQ.c src/hg/qaPushQ/qaPushQ.c index e6e4d89..42d251e 100644 --- src/hg/qaPushQ/qaPushQ.c +++ src/hg/qaPushQ/qaPushQ.c @@ -3423,33 +3423,41 @@ sqlFreeResult(&sr); slReverse(&kiList); sqlDisconnect(&betaconn); // are we really only allowed one remoteconn at a time? conn = sqlConnectRemote(host, user, password, database); /* filter the db list to make sure we actually have data */ struct dbDb *newList=NULL, *kiNext; for (ki = kiList; ki != NULL; ki = kiNext) { kiNext = ki->next; safef(query,sizeof(query), "select count(*) from pushQ " - "where priority='L' and releaseLog != '' and dbs like '%%%s%%' %s" + "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 ); 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 */ @@ -3559,33 +3567,41 @@ 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" ); safef(query,sizeof(query), "select releaseLog, qadate, releaseLogUrl from pushQ " - "where priority='L' and releaseLog != '' and dbs like '%%%s%%' %s" + "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 ); //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