4a44c9a604efe7b8a0b93c6a220c484a61d9892b braney Tue Sep 24 13:30:13 2013 -0700 more tweaks to optionally add version numbers to id's in genbank tables diff --git src/hg/hgc/mgcClick.c src/hg/hgc/mgcClick.c index dbdf9e4..88304bd 100644 --- src/hg/hgc/mgcClick.c +++ src/hg/hgc/mgcClick.c @@ -49,31 +49,31 @@ char *name; /* collection name */ char *title; /* collection title */ char *organism; /* organism name for URL, case-sensitive */ char *server; /* MGC server */ }; static struct mgcDb getMgcDb() /* get the mgc database info for the current host */ { struct mgcDb mgcDb; mgcDb.name = "MGC"; mgcDb.title = "Mammalian Gene Collection"; mgcDb.server = "mgc"; mgcDb.organism = NULL; /* NOTE: mgc server likes first letter of organism capitalized */ -if (startsWith("hg", database)) +if (startsWith("hg", database) || startsWith("braNey", database)) mgcDb.organism = "Hs"; else if (startsWith("mm", database)) mgcDb.organism = "Mm"; else if (startsWith("rn", database)) mgcDb.organism = "Rn"; else if (startsWith("bosTau", database)) mgcDb.organism = "Bt"; else if (startsWith("danRer", database)) { mgcDb.name = "ZGC"; mgcDb.title = "Zebrafish Gene Collection"; mgcDb.organism = "Dr"; mgcDb.server = "zgc"; } else if (startsWith("xenTro", database)) @@ -226,31 +226,37 @@ static char *cdnaInfoDbName(struct cloneInfo *ci) /* get the name to use in describing this gene collection */ { return (ci->isMgc ? mgcDbName() : "ORFeome"); } static void getRefSeqInfo(struct sqlConnection *conn, struct cloneInfo *ci) /* fill in refSeq info */ { ci->refSeqs = geneSimilaritiesBuildAt(conn, TRUE, ci->acc, seqName, ci->start, ci->gpTbl, "refGene"); // replace accession in gene names with accession.version struct geneSim *gs; for (gs = ci->refSeqs->genes; gs != NULL; gs = gs->next) { - char *accv = getAccVersion(conn, gs->gene->name); + char *accv ; + + // add version number if it's not already there + if (strchr(gs->gene->name, '.')) + accv = cloneString(gs->gene->name); + else + accv = getAccVersion(conn, gs->gene->name); freeMem(gs->gene->name); gs->gene->name = accv; } if ((ci->refSeqs != NULL) && (ci->refSeqs->genes != NULL)) { // use first one (highest similarity) ci->refSeqAccv = cloneString(ci->refSeqs->genes->gene->name); // get summary for first one with summary ci->refSeqSum = findRefSeqSummary(conn, ci->refSeqs, &ci->refSeqSumAccv); } } static void parseCloneField(struct cloneInfo *ci) /* parse the mrnaClone field to get IMAGE and MGC fields, if available */