af3a143571e5aa064eab75c34f9444b35413b562 chmalee Tue Nov 30 15:28:15 2021 -0800 Add snippet support to trix searching. Required changing the wordPos from the first highest matching wordIndex to the wordIndex of the actual span. Have trixContextIndex create a second level index for fast retrieval of line offsets in original text file used by ixIxx. Create a simple UI for navigating hgFind search results. diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index 949dfb1..d4a5449 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -4021,30 +4021,32 @@ } } } static void rInheritFields(struct trackDb *tdbList) /* Go through list inheriting fields from parent if possible, and invoking self on children. */ { struct trackDb *tdb; for (tdb = tdbList; tdb != NULL; tdb = tdb->next) { if (tdb->parent != NULL) { if (tdbIsSuperTrack(tdb->parent)) /* Do supertrack-specific inheritance. */ inheritFromSuper(tdb, tdb->parent); + // make sure composite subtracks inherit from their parents too: + trackDbFieldsFromSettings(tdb); } rInheritFields(tdb->subtracks); } } static void trackDbContainerMarkup(struct trackDb *parent, struct trackDb *tdbList) /* Set up things so that the COMPOSITE_NODE and related macros work on tdbList. */ { if (parent != NULL) { if (trackDbLocalSetting(parent, "compositeTrack")) tdbMarkAsComposite(parent); if (trackDbLocalSetting(parent, "container")) tdbMarkAsMultiTrack(parent); }