ca0f7a0fb08ea76beb615607c3170daf7b649e16 tdreszer Fri Mar 11 16:12:56 2011 -0800 Changed mdb API required this change. diff --git src/hg/lib/searchTracks.c src/hg/lib/searchTracks.c index c27d948..37e7ac4 100644 --- src/hg/lib/searchTracks.c +++ src/hg/lib/searchTracks.c @@ -1,268 +1,272 @@ // Track Search code which is shared between different CGIs #include "searchTracks.h" #include "cheapcgi.h" #include "hdb.h" #include "hgConfig.h" #include "hPrint.h" #include "trix.h" #include "mdb.h" #include "subText.h" #include "jsHelper.h" void getSearchTrixFile(char *database, char *buf, int len) // Fill-in the name of the track search trix file { char *trixPath = cfgOptionDefault("browser.trixPath", "/gbdb/$db/trackDb.ix"); struct subText *subList = subTextNew("$db", database); subTextStatic(subList, trixPath, buf, len); } 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", "tagAlign", "bed.gz", "bigBed", "broadPeak", "narrowPeak", "fastq", "bigWig", "wig" }; char *nicerTypes[] = { "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 0) { char *dropDownHtml = cgiMakeSingleSelectDropList(name,fileTypes,selected,ANYLABEL,NULL,extraHtml); slPairFreeList(&fileTypes); return dropDownHtml; } return NULL; } struct slPair *mdbVarsRelevant(struct sqlConnection *conn) // returns a white list of mdb vars that are relevant to the currect DB { struct slPair *cvApproved = mdbCvWhiteList(TRUE,FALSE); struct slPair *relevant = NULL; while(cvApproved != NULL) { struct slPair *oneVar = slPopHead(&cvApproved); char query[256]; safef(query, sizeof(query), "select count(*) from metaDb where var = '%s'",oneVar->name); if(sqlQuickNum(conn,query) > 0) slAddHead(&relevant, oneVar); else slPairFree(&oneVar); } slReverse(&relevant); return relevant; } struct slPair *mdbSelectPairs(struct cart *cart,enum searchTab selectedTab, struct slPair *mdbVars) // Returns the current mdb vars and vals in the table of drop down selects { // figure out how many metadata selects are visible. int numMetadataSelects = 0; struct slPair *mdbSelectPairs = NULL; if (mdbVars == NULL) return 0; // Get the current number of rows in the table of mdb selects for(;;) { char buf[256]; safef(buf, sizeof(buf), "%s%d", METADATA_NAME_PREFIX, numMetadataSelects + 1); char *str = cartOptionalString(cart, buf); if(isEmpty(str)) break; else numMetadataSelects++; } // Requesting to add or delete any? int delSearchSelect = cartUsualInt(cart, TRACK_SEARCH_DEL_ROW, 0); // 1-based row to delete int addSearchSelect = cartUsualInt(cart, TRACK_SEARCH_ADD_ROW, 0); // 1-based row to insert after if(delSearchSelect) numMetadataSelects--; if(addSearchSelect) numMetadataSelects++; if(numMetadataSelects) { int ix; char buf[256]; for(ix = 0; ix < numMetadataSelects; ix++) { int offset; // used to handle additions/deletions if(addSearchSelect > 0 && ix >= addSearchSelect) offset = 0; // do nothing to offset (i.e. copy data from previous row) else if(delSearchSelect > 0 && ix + 1 >= delSearchSelect) offset = 2; else offset = 1; safef(buf, sizeof(buf), "%s%d", METADATA_NAME_PREFIX, ix + offset); char *var = cartOptionalString(cart, buf); char *val = NULL; if(selectedTab!=simpleTab) { // We need to make sure var is valid in this assembly; if it isn't, reset it to "cell". if(slPairFindVal(mdbVars,var) == NULL) var = "cell"; else { safef(buf, sizeof(buf), "%s%d", METADATA_VALUE_PREFIX, ix + offset); enum mdbCvSearchable searchBy = mdbCvSearchMethod(var); if (searchBy == cvsSearchByMultiSelect) { // Multi-selects as comma delimited list of values struct slName *vals = cartOptionalSlNameList(cart,buf); if (vals) { val = slNameListToString(vals,','); // A comma delimited list of values slNameFreeList(&vals); } } - else + else if (searchBy == cvsSearchBySingleSelect || searchBy == cvsSearchByFreeText) val = cloneString(cartUsualString(cart, buf,ANYLABEL)); + //else if (searchBy == cvsSearchByDateRange || searchBy == cvsSearchByIntegerRange) + // { + // // TO BE IMPLEMENTED + // } if (val != NULL && sameString(val, ANYLABEL)) val = NULL; } } slPairAdd(&mdbSelectPairs,var,val); // val already cloned } if(delSearchSelect > 0) { safef(buf, sizeof(buf), "%s%d", METADATA_NAME_PREFIX, numMetadataSelects + 1); cartRemove(cart, buf); safef(buf, sizeof(buf), "%s%d", METADATA_VALUE_PREFIX, numMetadataSelects + 1); cartRemove(cart, buf); } } else { // create defaults slPairAdd(&mdbSelectPairs,"cell", NULL); slPairAdd(&mdbSelectPairs,"antibody",NULL); } slReverse(&mdbSelectPairs); return mdbSelectPairs; } char *mdbSelectsHtmlRows(struct sqlConnection *conn,struct slPair *mdbSelects,struct slPair *mdbVars,int cols) // generates the html for the table rows containing mdb var and val selects { struct dyString *output = dyStringNew(1024); dyStringPrintf(output,"ENCODE terms\n", cols,COLOR_DARKGREY); struct slPair *mdbSelect = mdbSelects; int row = 0; for(;mdbSelect != NULL; mdbSelect = mdbSelect->next) { char buf[256]; char *dropDownHtml = NULL; #define PLUS_MINUS_BUTTON "" #define ADD_PM_BUTTON(type,num,value) dyStringPrintf(output,PLUS_MINUS_BUTTON, (type), (num), (value), ((value) == '+' ? "add another row after":"delete"), (num)) dyStringAppend(output,"\n"); row++; if(slCount(mdbSelects) > 2 || row > 2) ADD_PM_BUTTON("minus", row, '-'); else dyStringAppend(output," "); ADD_PM_BUTTON("plus", row, '+'); dyStringAppend(output,"and \n"); safef(buf, sizeof(buf), "%s%i", METADATA_NAME_PREFIX, row); // Left side select of vars dropDownHtml = cgiMakeSingleSelectDropList(buf, mdbVars,mdbSelect->name, NULL,"mdbVar","style='font-size:.9em;' onchange='findTracksMdbVarChanged(this);'"); if (dropDownHtml) { dyStringAppend(output,dropDownHtml); freeMem(dropDownHtml); } // Right side select of vals safef(buf, sizeof(buf), "%s%i", METADATA_VALUE_PREFIX, row); enum mdbCvSearchable searchBy = mdbCvSearchMethod(mdbSelect->name); if (searchBy == cvsSearchBySingleSelect || searchBy == cvsSearchByMultiSelect) { dyStringPrintf(output,"\nis%s\n\n", row,(searchBy == cvsSearchByMultiSelect?" among":""),buf); - struct slPair *pairs = mdbValLabelSearch(conn, mdbSelect->name, MDB_VAL_STD_TRUNCATION, TRUE, FALSE); // Tables not files + struct slPair *pairs = mdbValLabelSearch(conn, mdbSelect->name, MDB_VAL_STD_TRUNCATION, FALSE, TRUE, FALSE); // not tags, yes tables, not files if (slCount(pairs) > 0) { char *dropDownHtml = cgiMakeSelectDropList((searchBy == cvsSearchByMultiSelect), buf, pairs,mdbSelect->val, ANYLABEL,"mdbVal","style='min-width:200px; font-size:.9em;' onchange='findTracksMdbValChanged(this);'"); if (dropDownHtml) { dyStringAppend(output,dropDownHtml); freeMem(dropDownHtml); } slPairFreeList(&pairs); } } else if (searchBy == cvsSearchByFreeText) { dyStringPrintf(output,"contains\n\n",row,buf); dyStringPrintf(output,"\n", buf,(mdbSelect->val ? (char *)mdbSelect->val: "")); } - else if (searchBy == cvsSearchByDateRange || searchBy == cvsSearchByIntegerRange) - { - // TO BE IMPLEMENTED - } + //else if (searchBy == cvsSearchByDateRange || searchBy == cvsSearchByIntegerRange) + // { + // // TO BE IMPLEMENTED + // } dyStringPrintf(output," \n", row); dyStringPrintf(output,"\n"); } dyStringPrintf(output," ", cols); return dyStringCannibalize(&output); }