c67427cd84c3312276472b5f6c32646619aa75c4 cline Mon Oct 10 18:23:00 2011 -0700 Addressing Redmine bug #5592: rewording the error message 'Couldn't find NM_214677 in refLink table - database inconsistency.' as 'Couldn't find NM_214677 in refLink table - this accession may no longer be available.'. I'd previously fixed this in one place, but there were still two more places to fix diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index 3c7619b..8a03cb4 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -10903,31 +10903,31 @@ int start = cartInt(cart, "o"); int left = cartInt(cart, "l"); int right = cartInt(cart, "r"); char *chrom = cartString(cart, "c"); /* Make sure to escape single quotes for DB parseability */ if (strchr(rnaName, '\'')) { sqlRnaName = replaceChars(rnaName, "'", "''"); } /* get refLink entry */ if (strstr(rnaName, "NM_") != NULL) { safef(query, sizeof(query), "select * from refLink where mrnaAcc = '%s'", sqlRnaName); sr = sqlGetResult(conn, query); if ((row = sqlNextRow(sr)) == NULL) - errAbort("Couldn't find %s in refLink table - database inconsistency.", rnaName); + errAbort("Couldn't find %s in refLink table - this accession may no longer be available.", rnaName); rl = refLinkLoad(row); sqlFreeResult(&sr); } else { rlR.name = strdup(kgId); rlR.mrnaAcc = strdup(kgId); rlR.locusLinkId = 0; rl = &rlR; } cartWebStart(cart, database, "Known Gene"); printf("\n\n"); prKnownGeneInfo(conn, rnaName, sqlRnaName, rl); @@ -10993,31 +10993,31 @@ struct refLink *rl; int start = cartInt(cart, "o"); int left = cartInt(cart, "l"); int right = cartInt(cart, "r"); char *chrom = cartString(cart, "c"); /* Make sure to escape single quotes for DB parseability */ if (strchr(rnaName, '\'')) { sqlRnaName = replaceChars(rnaName, "'", "''"); } /* get refLink entry */ safef(query, sizeof(query), "select * from refLink where mrnaAcc = '%s'", sqlRnaName); sr = sqlGetResult(conn, query); if ((row = sqlNextRow(sr)) == NULL) - errAbort("Couldn't find %s in refLink table - database inconsistency.", rnaName); + errAbort("Couldn't find %s in refLink table - this accession may no longer be available.", rnaName); rl = refLinkLoad(row); sqlFreeResult(&sr); /* print the first section with info */ if (isXeno) cartWebStart(cart, database, "Non-%s RefSeq Gene", organism); else cartWebStart(cart, database, "RefSeq Gene"); printf("
\n\n"); prRefGeneInfo(conn, rnaName, sqlRnaName, rl, isXeno); addGeneExtra(rl->name); /* adds columns if extra info is available */ printf("\n
\n"); /* optional summary text */