cce51ca0744763b5d358c73cf6190d7a6ea29399 braney Sun Jan 30 07:38:58 2022 -0800 oops ... added an errant lineFileClose on the last checkin diff --git src/hg/lib/chromAlias.c src/hg/lib/chromAlias.c index b4e66b6..79cc541 100644 --- src/hg/lib/chromAlias.c +++ src/hg/lib/chromAlias.c @@ -213,32 +213,30 @@ { struct chromAlias *ali; AllocVar(ali); ali->alias = cloneString(words[i]); ali->chrom = cloneString(words[0]); ali->source = cloneString("asmHub"); hashAdd(chromHashes.forwardHash, ali->alias, ali); hashAdd(chromHashes.reverseHash, ali->chrom, ali); hashAdd(chromHashes.chromToAliasHash, ali->chrom, ali->alias); hashAdd(chromHashes.aliasToChromHash, ali->alias, ali->chrom); //hashAdd(aliasHash, words[0], ali); } } } } - -lineFileClose(&lf); } static void readFieldedTable(struct lineFile *lf) /* Use the fieldedTable library to read in fully populated chromAlias.txt file. */ { struct fieldedTable *aliasTable = fieldedTableAttach(lf, NULL, 0); struct fieldedRow *row; for(row = aliasTable->rowList; row; row = row->next) { char *chrom = row->row[0]; unsigned field; for(field=1; field< aliasTable->fieldCount; field++) { @@ -272,31 +270,30 @@ char *line; if (!lineFileNext(lf, &line, NULL)) errAbort("%s is empty", lf->fileName); lineFileReuse(lf); // for the moment always read the alias file in the "old" way //if (line[0] == '#') if (0) readFieldedTable(lf); else readOldAlias(lf); lineFileClose(&lf); } - static void chromAliasSetupSql(char *database) /* Look for a chromAlias SQL table and load the hashes with its contents. */ { if (!hTableExists(database, "chromAlias")) return; struct sqlConnection *conn = hAllocConn(database); chromHashes.forwardHash = hashNew(0); chromHashes.reverseHash = hashNew(0); chromHashes.chromToAliasHash = hashNew(0); chromHashes.aliasToChromHash = hashNew(0); char query[2048]; sqlSafef(query, sizeof(query), "select * from chromAlias"); struct sqlResult *sr = sqlGetResult(conn, query);