70d4208efa11f262ba5591198214c9ccdc6b54ae angie Mon Aug 22 22:24:05 2011 -0700 Feature #3707 (VCF+tabix support in hgTables):Basic hgTables support for VCF, modeled after BAM code. Tested all fields, selected fields, bed output; filter, intersection, schema on 3 flavors of vcfTabix: ftp://ftp-trace.ncbi.nih.gov/1000genomes/ftp/release/20101123/interim_phase1_release/ALL.chr17.phase1.projectConsensus.genotypes.vcf.gz ftp://ftp-trace.ncbi.nlm.nih.gov/1000genomes/ftp/release/20100804/AFR.dindel.20100804.sites.vcf.gz ftp://ftp.ncbi.nih.gov/snp/organisms/human_9606/VCF/v4.0/ByChromosomeNoGeno/00-All.vcf.gz diff --git src/hg/hgTables/asObj.c src/hg/hgTables/asObj.c index ac3f730..3acffb3 100644 --- src/hg/hgTables/asObj.c +++ src/hg/hgTables/asObj.c @@ -3,37 +3,35 @@ #include "common.h" #include "linefile.h" #include "jksql.h" #include "asParse.h" #include "errCatch.h" #include "hgTables.h" static char const rcsid[] = "$Id: asObj.c,v 1.4 2009/05/20 20:59:55 mikep Exp $"; static struct asObject *asForTableOrDie(struct sqlConnection *conn, char *table) /* Get autoSQL description if any associated with table. Abort if * there's a problem*/ { struct asObject *asObj = NULL; if (isBigBed(database, table, curTrack, ctLookupName)) - { asObj = bigBedAsForTable(table, conn); - } else if (isBamTable(table)) - { asObj = bamAsObj(); - } +else if (isVcfTable(table)) + asObj = vcfAsObj(); else { if (sqlTableExists(conn, "tableDescriptions")) { char query[256]; char *asText = NULL; /* Try split table first. */ safef(query, sizeof(query), "select autoSqlDef from tableDescriptions where tableName='chrN_%s'", table); asText = sqlQuickString(conn, query); /* If no result try unsplit table. */ if (asText == NULL)