\n"); // parent container if (visibleFacetList) { // left column printf("

\n"); - struct slName *nameList = slNameListFromComma(visibleFacetList); - int f; - for (f = 0; f < table->fieldCount; ++f) + struct slName *visList = slNameListFromComma(visibleFacetList); + struct slName *vis; + for (vis = visList; vis != NULL; vis = vis->next) { + int f = fieldedTableMustFindFieldIx(table, vis->name); struct facetField *field = ffArray[f]; - if (slNameInListUseCase(nameList, field->fieldName)) // i.e. is this field a visible facet? - { htmlPrintf("\n"); } - } printf("

\n"); // Clicking a checkbox is actually a click on the following link jsInlineF( "$(function () {\n" " $('.cdwFSCheckBox').click(function() {\n" " this.nextSibling.nextSibling.click();\n" " });\n" "});\n"); } // start right column, if there are two columns if (visibleFacetList) printf("

\n"); else printf("

\n"); printf("

\n"); +if (visibleFieldList != NULL) + { + struct slName *fieldList = slNameListFromComma(visibleFieldList); printf(" \n"); /* Draw optional filters cells ahead of column labels*/ printf("\n"); if (withFilters) - showTableFilterControlRow(table, cart, varPrefix, maxLenField, suggestHash); -showTableSortingLabelRow(table, cart, varPrefix, returnUrl); + showTableFilterControlRow(table, fieldList, cart, varPrefix, maxLenField, suggestHash); + showTableSortingLabelRow(table, fieldList, cart, varPrefix, returnUrl); printf("\n"); printf("\n"); -showTableDataRows(table, pageSize, maxLenField, tagOutputWrappers, wrapperContext); + showTableDataRows(table, fieldList, pageSize, maxLenField, tagOutputWrappers, wrapperContext); printf("\n"); printf("

\n"); printf("

"); - if (largerContext != NULL) showTablePaging(table, cart, varPrefix, largerContext, pageSize); + } + if (visibleFacetList) // close right column, if there are two columns printf("

"); printf("

\n"); //close parent container } void webSortableFieldedTable(struct cart *cart, struct fieldedTable *table, char *returnUrl, char *varPrefix, int maxLenField, struct hash *tagOutputWrappers, void *wrapperContext) /* Display all of table including a sortable label row. The tagOutputWrappers * is an optional way to enrich output of specific columns of the table. It is keyed * by column name and has for values functions of type webTableOutputWrapperType. */ { -webFilteredFieldedTable(cart, table, returnUrl, varPrefix, +webFilteredFieldedTable(cart, table, NULL, returnUrl, varPrefix, maxLenField, tagOutputWrappers, wrapperContext, FALSE, NULL, - slCount(table->rowList), NULL, NULL, NULL, NULL, NULL); + slCount(table->rowList), + 0, NULL, NULL, NULL, NULL, NULL); } void webTableBuildQuery(struct cart *cart, char *from, char *initialWhere, char *varPrefix, char *fields, boolean withFilters, struct dyString **retQuery, struct dyString **retWhere) /* Construct select, from and where clauses in query, keeping an additional copy of where * Returns the SQL query and the SQL where expression as two dyStrings (need to be freed) */ { struct dyString *query = dyStringNew(0); struct dyString *where = dyStringNew(0); struct slName *field, *fieldList = commaSepToSlNames(fields); boolean gotWhere = FALSE; sqlDyStringPrintf(query, "select %-s from %-s", sqlCkIl(fields), sqlCkIl(from)); if (!isEmpty(initialWhere)) @@ -759,83 +770,136 @@ safef(orderVar, sizeof(orderVar), "%s_order", varPrefix); char *orderFields = cartUsualString(cart, orderVar, ""); if (!isEmpty(orderFields)) { if (orderFields[0] == '-') sqlDyStringPrintf(query, " order by %s desc", orderFields+1); else sqlDyStringPrintf(query, " order by %s", orderFields); } // return query and where expression *retQuery = query; *retWhere = where; } -void webFilteredSqlTable(struct cart *cart, struct sqlConnection *conn, - char *fields, char *from, char *initialWhere, - char *returnUrl, char *varPrefix, int maxFieldWidth, - struct hash *tagOutWrappers, void *wrapperContext, - boolean withFilters, char *itemPlural, int pageSize, struct hash *suggestHash, char *visibleFacetList, - void (*addFunc)(int) ) -/* Given a query to the database in conn that is basically a select query broken into - * separate clauses, construct and display an HTML table around results. This HTML table has - * column names that will sort the table, and optionally (if withFilters is set) +struct dyString *fuseCsvFields(struct sqlConnection *conn, char *table, + char *firstCsv, char *secondCsv) +/* Return a list that is firstCsv followed by any fields in secondCsv not already in firstCsv + * "a,b,c,d", "b,f,d,e" yeilds "a,b,c,d,f,e" + * order is preserved in firstCsv and when possible in second */ +{ +struct hash *uniq = hashNew(0); +struct dyString *result = dyStringNew(0); + +/* Add everything in aList to both hash and result */ +struct slName *el; +struct slName *aList = slNameListFromComma(firstCsv); +for (el = aList; el != NULL; el = el->next) + { + if (sqlColumnExists(conn, table, el->name)) + csvEscapeAndAppend(result, el->name); + hashAdd(uniq, el->name, NULL); + } + +/* Only add bList if it's not in there already and it is in database */ +struct slName *bList = slNameListFromComma(secondCsv); +for (el = bList; el != NULL; el = el->next) + { + if (!hashLookup(uniq, el->name)) + { + if (sqlColumnExists(conn, table, el->name)) + csvEscapeAndAppend(result, el->name); + hashAdd(uniq, el->name, NULL); + } + } + +/* Clean up and return with result */ +slFreeList(&aList); +slFreeList(&bList); +hashFree(&uniq); +return result; +} + +void webFilteredSqlTable(struct cart *cart, /* User set preferences here */ + struct sqlConnection *conn, /* Connection to database */ + char *fields, char *from, char *initialWhere, /* Our query in three parts */ + char *returnUrl, char *varPrefix, /* Url to get back to us, and cart var prefix */ + int maxFieldWidth, /* How big do we let fields get in characters */ + struct hash *tagOutWrappers, /* A hash full of callbacks, one for each column */ + void *wrapperContext, /* Gets passed to callbacks in tagOutWrappers */ + boolean withFilters, /* If TRUE put up filter controls under labels */ + char *pluralInstructions, /* If non-NULL put up instructions and clear/search buttons */ + int pageSize, /* How many items per page */ + int facetUsualSize, /* How many items in a facet before opening */ + struct hash *suggestHash, /* If using filter can put suggestions for categorical items here */ + char *visibleFacetList, /* Comma separated list of fields to facet on */ + void (*addFunc)(int) ) /* Callback relevant with pluralInstructions only */ +/* Turn sql query into a nice interactive table, possibly with facets. It constructs + * a query to the database in conn that is basically a select query broken into + * separate clauses, construct and display an HTML table around results. Optionally table + * may have a faceted search to the left or fields that can filter under the labels. The table + * has column names that will sort the table, and optionally (if withFilters is set) * it will also allow field-by-field wildcard queries on a set of controls it draws above * the labels. * Much of the functionality rests on the call to webFilteredFieldedTable. This function * does the work needed to bring in sections of potentially huge results sets into * the fieldedTable. */ { struct dyString *query; struct dyString *where; -webTableBuildQuery(cart, from, initialWhere, varPrefix, fields, withFilters, &query, &where); +struct dyString *fusedFields = fuseCsvFields(conn, from, fields, visibleFacetList); +webTableBuildQuery(cart, from, initialWhere, varPrefix, + fusedFields->string, withFilters, &query, &where); char *selectedFacetValues=cartUsualString(cart, "cdwSelectedFieldValues", ""); struct facetField **ffArray = NULL; struct fieldedTable *table = NULL; char pageVar[64]; safef(pageVar, sizeof(pageVar), "%s_page", varPrefix); int page = 0; struct fieldedTableSegment context; page = cartUsualInt(cart, pageVar, 0) - 1; if (page < 0) page = 0; context.tableOffset = page * pageSize; if (visibleFacetList) { - table = fieldedTableAndCountsFromDbQuery(conn, query->string, pageSize, context.tableOffset, selectedFacetValues, &ffArray, &context.tableSize); + table = fieldedTableAndCountsFromDbQuery(conn, query->string, pageSize, + context.tableOffset, selectedFacetValues, &ffArray, &context.tableSize); } else { /* Figure out size of query result */ struct dyString *countQuery = sqlDyStringCreate("select count(*) from %-s", sqlCkIl(from)); sqlDyStringPrintf(countQuery, "%-s", where->string); // trust context.tableSize = sqlQuickNum(conn, countQuery->string); dyStringFree(&countQuery); } if (context.tableSize > pageSize) { int lastPage = (context.tableSize-1)/pageSize; if (page > lastPage) page = lastPage; context.tableOffset = page * pageSize; } if (!visibleFacetList) { sqlDyStringPrintf(query, " limit %d offset %d", pageSize, context.tableOffset); table = fieldedTableFromDbQuery(conn, query->string); } -webFilteredFieldedTable(cart, table, returnUrl, varPrefix, maxFieldWidth, - tagOutWrappers, wrapperContext, withFilters, itemPlural, pageSize, &context, suggestHash, ffArray, visibleFacetList, addFunc); +webFilteredFieldedTable(cart, table, fields, returnUrl, varPrefix, maxFieldWidth, + tagOutWrappers, wrapperContext, withFilters, pluralInstructions, + pageSize, facetUsualSize, &context, suggestHash, ffArray, visibleFacetList, addFunc); fieldedTableFree(&table); +dyStringFree(&fusedFields); dyStringFree(&query); dyStringFree(&where); }