4df6642beeb0cde7fb2570c6900315d8fa216056 tdreszer Wed Mar 9 12:39:35 2011 -0800 Fix a couple of small bugs I just introduced to track/file searches diff --git src/hg/lib/searchTracks.c src/hg/lib/searchTracks.c index 4dd7626..c27d948 100644 --- src/hg/lib/searchTracks.c +++ src/hg/lib/searchTracks.c @@ -170,32 +170,32 @@ } } 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", cloneString(ANYLABEL)); - slPairAdd(&mdbSelectPairs,"antibody",cloneString(ANYLABEL)); + 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,"<tr><td colspan='%d' align='right' class='lineOnTop' style='height:20px; max-height:20px;'><em style='color:%s; width:200px;'>ENCODE terms</em></td></tr>\n", cols,COLOR_DARKGREY); struct slPair *mdbSelect = mdbSelects; int row = 0; @@ -208,31 +208,31 @@ #define ADD_PM_BUTTON(type,num,value) dyStringPrintf(output,PLUS_MINUS_BUTTON, (type), (num), (value), ((value) == '+' ? "add another row after":"delete"), (num)) dyStringAppend(output,"<tr valign='top' class='mdbSelect'><td nowrap>\n"); row++; if(slCount(mdbSelects) > 2 || row > 2) ADD_PM_BUTTON("minus", row, '-'); else dyStringAppend(output," "); ADD_PM_BUTTON("plus", row, '+'); dyStringAppend(output,"</td><td>and </td><td colspan=3 nowrap>\n"); safef(buf, sizeof(buf), "%s%i", METADATA_NAME_PREFIX, row); // Left side select of vars - dropDownHtml = cgiMakeSingleSelectDropList(buf, mdbVars,mdbSelect->name, ANYLABEL,"mdbVar","style='font-size:.9em;' onchange='findTracksMdbVarChanged(this);'"); + 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,"</td>\n<td align='right' id='isLike%i' style='width:10px; white-space:nowrap;'>is%s</td>\n<td nowrap id='%s' style='max-width:600px;'>\n", row,(searchBy == cvsSearchByMultiSelect?" among":""),buf); struct slPair *pairs = mdbValLabelSearch(conn, mdbSelect->name, MDB_VAL_STD_TRUNCATION, TRUE, FALSE); // Tables not files if (slCount(pairs) > 0)