7c8f5b85d9f0416d28e7c05e9789022ce046d7fb hiram Sat Feb 4 14:46:47 2012 -0800 hTableExists fails when the db does not exist, eliminate dependency on hgFixed existing for cutters data from hgFixed and trackVersion table in hgFixed diff --git src/hg/lib/ensFace.c src/hg/lib/ensFace.c index f45465a..41aa8c0 100644 --- src/hg/lib/ensFace.c +++ src/hg/lib/ensFace.c @@ -128,31 +128,31 @@ dyStringPrintf(dy, "http://%s.archive.ensembl.org/%s/contigview?chr=%s&start=%d&end=%d", archive, ensOrg, chrName, start, end); } else dyStringPrintf(dy, "http://www.ensembl.org/%s/contigview?chr=%s&start=%d&end=%d", ensOrg, chrName, start, end); return dy; } void ensGeneTrackVersion(char *database, char *ensVersionString, char *ensDateReference, int stringSize) /* check for trackVersion table and find Ensembl version */ { /* see if hgFixed.trackVersion exists */ -boolean trackVersionExists = hTableExists("hgFixed", "trackVersion"); +boolean trackVersionExists = (hDbExists("hgFixed") && hTableExists("hgFixed", "trackVersion")); ensVersionString[0] = 0; ensDateReference[0] = 0; if (trackVersionExists) { struct sqlConnection *conn = hAllocConn("hgFixed"); char query[256]; safef(query, sizeof(query), "select version,dateReference from hgFixed.trackVersion where db = '%s' order by updateTime DESC limit 1", database); struct sqlResult *sr = sqlGetResult(conn, query); char **row; while ((row = sqlNextRow(sr)) != NULL) { safef(ensVersionString, stringSize, "Ensembl %s", row[0]); safef(ensDateReference, stringSize, "%s", row[1]); }