895637ca3ebbe9132ed9db42a23c232817a4d23c tdreszer Fri Jan 28 16:38:47 2011 -0800 Removed obsolete ifdef diff --git src/hg/hgApi/hgApi.c src/hg/hgApi/hgApi.c index c44b13b..b8a1f7f 100644 --- src/hg/hgApi/hgApi.c +++ src/hg/hgApi/hgApi.c @@ -103,31 +103,30 @@ fail("Missing var parameter"); struct slPair *pairs = mdbValLabelSearch(conn, var, MDB_VAL_STD_TRUNCATION, TRUE, FALSE); // Tables not files struct slPair *pair; dyStringPrintf(output, "[\n"); for (pair = pairs; pair != NULL; pair = pair->next) { if(pair != pairs) dyStringPrintf(output, ",\n"); dyStringPrintf(output, "['%s','%s']", javaScriptLiteralEncode(pair->name), javaScriptLiteralEncode(pair->val)); } dyStringPrintf(output, "\n]\n"); } else fail("Assembly does not support metaDb"); } -#ifdef CV_SEARCH_SUPPORTS_FREETEXT // TODO: move to lib since hgTracks and hgApi share #define METADATA_VALUE_PREFIX "hgt_mdbVal" else if(startsWith(METADATA_VALUE_PREFIX, cmd)) { // Returns metaDb value control: drop down or free text, with or without help link. // e.g. http://genome.ucsc.edu/hgApi?db=hg18&cmd=hgt_mdbVal3&var=cell // TODO: Move guts to lib, so that hgTracks::searchTracks.c and hgApi.c can share struct sqlConnection *conn = hAllocConn(database); boolean metaDbExists = sqlTableExists(conn, "metaDb"); if(metaDbExists) { char *var = cgiOptionalString("var"); if(var) @@ -166,31 +165,30 @@ } //else if (searchBy == cvsSearchByMultiSelect) // { // // TO BE IMPLEMENTED // } //else if (searchBy == cvsSearchByDateRange || searchBy == cvsSearchByDateRange) // { // // TO BE IMPLEMENTED // } else fail("Metadata variable not searchable"); } else fail("Assembly does not support metaDb"); } -#endif///def CV_SEARCH_SUPPORTS_FREETEXT else if(!strcmp(cmd, "tableMetadata")) { // returns an html table with metadata for a given track char *trackName = cgiOptionalString("track"); boolean showLonglabel = (NULL != cgiOptionalString("showLonglabel")); boolean showShortLabel = (NULL != cgiOptionalString("showShortLabel")); if (trackName != NULL) { struct trackDb *tdb = hTrackDbForTrackAndAncestors(database, trackName); // Doesn't get whole track list if (tdb != NULL) { char * html = metadataAsHtmlTable(database,tdb,showLonglabel,showShortLabel,NULL); if (html) { dyStringAppend(output,html); freeMem(html);