f003629f68153a2913857d282fe1ebf9614d1791 tdreszer Thu Apr 7 13:22:40 2011 -0700 Make fileIndex an implied mdb var as far as file search is concerned. diff --git src/hg/lib/search.c src/hg/lib/search.c index d43ecf1..a678cee 100644 --- src/hg/lib/search.c +++ src/hg/lib/search.c @@ -21,44 +21,42 @@ boolean isSearchTracksSupported(char *database, struct cart *cart) // Return TRUE if searchTracks is supported for this database and javascript is supported too { if (!advancedJavascriptFeaturesEnabled(cart)) return FALSE; char trixFile[HDB_MAX_PATH_STRING]; getSearchTrixFile(database, trixFile, sizeof(trixFile)); return fileExists(trixFile); } struct slPair *fileFormatSearchWhiteList() // Gets the whitelist of approved file formats that is allowed for search { char *crudeTypes[] = { - "bam", - "bam.bai", + "bam", // "bam.bai" is now alway selected with bam, "tagAlign", "bed.gz", "bigBed", "broadPeak", "narrowPeak", "fastq", "bigWig", - "wig" + "wig" // TODO: Add "other" category. TODO: make into multi-select }; char *nicerTypes[] = { - "Alignment binary (bam) - binary SAM", - "Alignment binary index (bai) - binary SAM index", + "Alignment binary (bam) - binary SAM", // "Alignment binary index (bai) - binary SAM index", "Alignment tags (tagAlign)", "bed - browser extensible data", "bigBed - self index, often remote bed format", "Peaks Broad (broadPeak) - ENCODE large region peak format", "Peaks Narrow (narrowPeak) - ENCODE small region peak format", "Raw Sequence (fastq) - High throughput sequence format", "Signal (bigWig) - self index, often remote wiggle format", "Signal (wig) - wiggle format" }; struct slPair *fileTypes = NULL; int ix = 0, count = sizeof(crudeTypes)/sizeof(char *); for(ix=0;ix