c4fe426d0936ce30c7fd65c63dd29a19abb830dc braney Sun Mar 15 15:22:12 2015 -0700 allow using different names for the following tables: dbDb, defaultDb, genomeClade, and clade. This will allow for testing of alternate versions of these tables on hgwdev. diff --git src/hg/hgConvert/hgConvert.c src/hg/hgConvert/hgConvert.c index ccaa2a1..2171579 100644 --- src/hg/hgConvert/hgConvert.c +++ src/hg/hgConvert/hgConvert.c @@ -99,32 +99,32 @@ cgiTableRowEnd(); cgiTableEnd(); puts("\n"); cartWebEnd(); } static double scoreLiftOverChain(struct liftOverChain *chain, char *fromOrg, char *fromDb, char *toOrg, char *toDb, struct hash *dbRank ) /* Score the chain in terms of best match for cart settings */ { double score = 0; -char *chainFromOrg = hArchiveOrganism(chain->fromDb); -char *chainToOrg = hArchiveOrganism(chain->toDb); +char *chainFromOrg = hOrganism(chain->fromDb); +char *chainToOrg = hOrganism(chain->toDb); int fromRank = hashIntValDefault(dbRank, chain->fromDb, 0); int toRank = hashIntValDefault(dbRank, chain->toDb, 0); int maxRank = hashIntVal(dbRank, "maxRank"); if (sameOk(fromOrg,chainFromOrg) && sameOk(fromDb,chain->fromDb) && sameOk(toOrg,chainToOrg) && sameOk(toDb,chain->toDb)) score += 10000000; if (sameOk(fromOrg,chainFromOrg)) score += 2000000; if (sameOk(fromDb,chain->fromDb)) score += 1000000;