deac2d6a8dfdae141830f4ac0b79d86c48d0f0a0 max Wed Mar 12 07:23:25 2014 -0700 Moving code from commit 0fb6cafc5cebeb0f383804ed9df2cd01be10227f into hdbbecause it's also needed by hgPcr. refs #11957. (Should not affect RR, as hReplaceGbdb will return the same string, so it only adds and then removes a .2bit filename from the path.) diff --git src/hg/hgPcr/hgPcr.c src/hg/hgPcr/hgPcr.c index 46f0d99..a240314 100644 --- src/hg/hgPcr/hgPcr.c +++ src/hg/hgPcr/hgPcr.c @@ -74,31 +74,31 @@ /* Do a little join to get data to fit into the pcrServer. */ sr = sqlGetResult(conn, "NOSQLINJ select dbDb.name,dbDb.genome,dbDb.description,blatServers.host," "blatServers.port,dbDb.nibPath " "from dbDb,blatServers where " "dbDb.name = blatServers.db " "and blatServers.canPcr = 1 order by dbDb.orderKey" ); while ((row = sqlNextRow(sr)) != NULL) { AllocVar(server); server->db = cloneString(row[0]); server->genome = cloneString(row[1]); server->description = cloneString(row[2]); server->host = cloneString(row[3]); server->port = cloneString(row[4]); - server->seqDir = hReplaceGbdb(row[5]); + server->seqDir = hReplaceGbdbSeqDir(row[5], server->db); slAddHead(&serverList, server); } sqlFreeResult(&sr); hDisconnectCentral(&conn); if (serverList == NULL) errAbort("Sorry, no PCR servers are available"); slReverse(&serverList); return serverList; } struct pcrServer *findServer(char *db, struct pcrServer *serverList) /* Return server for given database. Db can either be * database name or description. */ { struct pcrServer *server;