a678ada6c54aca4486bef3da5a363ab614e8c733 kate Wed May 13 09:01:24 2015 -0700 Add version check features to hubCheck (-version, -core, -extra, -settings). Initial coding, not yet functional. Also added levels (for testing only) to settings spec. refs #10015 diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index a98c743..c46c41c 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -591,30 +591,32 @@ errAbort("multiple records in %s", url); /* Allocate hub and fill in settings field and url. */ AllocVar(hub); hub->url = cloneString(url); hub->name = cloneString(hubName); hub->settings = hubRa; /* Fill in required fields from settings. */ trackHubRequiredSetting(hub, "hub"); trackHubRequiredSetting(hub, "email"); hub->shortLabel = trackHubRequiredSetting(hub, "shortLabel"); hub->longLabel = trackHubRequiredSetting(hub, "longLabel"); hub->genomesFile = trackHubRequiredSetting(hub, "genomesFile"); hub->email = trackHubSetting(hub, "email"); +hub->version = trackHubSetting(hub, "version"); // default to current version +hub->level = trackHubSetting(hub, "level"); // "core" or "all" char *descriptionUrl = trackHubSetting(hub, "descriptionUrl"); if (descriptionUrl != NULL) hub->descriptionUrl = trackHubRelativeUrl(hub->url, descriptionUrl); lineFileClose(&lf); char *genomesUrl = trackHubRelativeUrl(hub->url, hub->genomesFile); hub->genomeHash = hashNew(8); hub->genomeList = trackHubGenomeReadRa(genomesUrl, hub); freez(&genomesUrl); cacheHub(hub); return hub; }