0e2add24701b51d27afce7581ad3c54789f6d23e hiram Fri Mar 22 15:35:14 2019 -0700 help text now in include file refs #18869 diff --git src/hg/hubApi/hubApi.c src/hg/hubApi/hubApi.c index 76b3083..1956113 100644 --- src/hg/hubApi/hubApi.c +++ src/hg/hubApi/hubApi.c @@ -938,93 +938,50 @@ for (hel = helList; hel; hel = hel->next) { if (sameOk("track count", hel->name)) continue; if (isSupportedType(hel->name)) hPrintf("
  • %d - %s - supported
  • \n", ptToInt(hel->val), hel->name); else hPrintf("
  • %d - %s
  • \n", ptToInt(hel->val), hel->name); } hPrintf(" \n"); } hPrintf("\n"); hPrintf("

    \n"); } // static void tracksForUcscDb(char * db) -static void introductionText() -/* output explanation text */ -{ -char *scriptUri = getenv("SCRIPT_URI"); - -hPrintf("

    JSON data API interface to U.C. Santa Cruz genome browser data

    \n"); -hPrintf("

    Data access URL: %s

    \n", scriptUri); -hPrintf("

    Endpoint functions:

    \n"); -hPrintf("\n"); -hPrintf("

    Parameters to endpoint functions:

    \n"); -hPrintf("\n"); -hPrintf("

    Supported track types, at this time, for getData functions:

    \n"); -hPrintf("\n"); -} - static void initUrlPrefix() /* set up urlPrefix for self referenes */ { char *httpHost = getenv("HTTP_HOST"); if (isEmpty(httpHost)) urlPrefix = ""; else { if (! startsWith("hgwdev-api", httpHost)) { if (startsWith("hgwdev",httpHost) || startsWith("genome-test", httpHost)) { urlPrefix = "../cgi-bin/hubApi"; } } } } +#ifdef NOT static void showExamples(char *url, struct trackHubGenome *hubGenome, char *ucscDb) { hPrintf("

    Example URLs to return json data structures:

    \n"); hPrintf("

    listing functions

    \n"); hPrintf("
      \n"); hPrintf("
    1. list public hubs %s/list/publicHubs
    2. \n", urlPrefix, urlPrefix); hPrintf("
    3. list database genomes %s/list/ucscGenomes
    4. \n", urlPrefix, urlPrefix); hPrintf("
    5. list genomes from specified hub %s/list/hubGenomes?hubUrl=%s
    6. \n", urlPrefix, url, urlPrefix, url); hPrintf("
    7. list tracks from specified hub and genome %s/list/tracks?hubUrl=%s&genome=%s
    8. \n", urlPrefix, url, hubGenome->name, urlPrefix, url, hubGenome->name); hPrintf("
    9. list tracks from specified UCSC database %s/list/tracks?db=%s
    10. \n", urlPrefix, ucscDb, urlPrefix, ucscDb); hPrintf("
    11. list chromosomes from specified UCSC database %s/list/chromosomes?db=%s
    12. \n", urlPrefix, ucscDb, urlPrefix, ucscDb); hPrintf("
    13. list chromosomes from specified track from UCSC databaset %s/list/chromosomes?db=%s&track=gold
    14. \n", urlPrefix, ucscDb, urlPrefix, ucscDb); hPrintf("
    \n"); @@ -1041,30 +998,32 @@ hPrintf("
  • get all track data from specified hub and track name %s/getData/track?hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt&genome=_araTha1&track=gc5Base
  • \n", urlPrefix, urlPrefix); hPrintf("
  • get track data from specified hub, chromosome, track name, start and end coordinates %s/getData/track?hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt&genome=_araTha1&chrom=chrMt&track=gc5Base&start=143600&end=143685
  • \n", urlPrefix, urlPrefix); hPrintf("
  • get bigWig track data from specified database, chromosome, track name, start and end coordinates %s/getData/track?db=%s&chrom=chrI&track=gc5BaseBw&start=107680&end=186148
  • \n", urlPrefix, defaultDb, urlPrefix, defaultDb); hPrintf("
  • get bigBed track data from specified database, chromosome, track name, start and end coordinates %s/getData/track?db=%s&chrom=chrII&track=ncbiRefSeqOther&start=14334626&end=14979625
  • \n", urlPrefix, defaultDb, urlPrefix, defaultDb); hPrintf("
  • get narrowPeak track data from specified database, chromosome, track name, start and end coordinates %s/getData/track?db=%s&chrom=chr1&track=wgEncodeAwgDnaseDuke8988tUniPk&start=14334626&end=14979625
  • \n", urlPrefix, "hg19", urlPrefix, "hg19"); hPrintf("
  • get broadPeak track data from specified database, chromosome, track name, start and end coordinates %s/getData/track?db=%s&chrom=chr1&track=wgEncodeBroadHistoneOsteoP300kat3bPk&start=14334626&end=14979625
  • \n", urlPrefix, "hg19", urlPrefix, "hg19"); hPrintf("\n"); hPrintf("

    Example URLs to generate errors:

    \n"); hPrintf("
      \n"); hPrintf("
    1. get track data from specified hub, chromosome, track name, start and end coordinates %s/getData/track?hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt&genome=_araTha1&chrom=chrI&track=assembly_&start=0&end=14309681
    2. \n", urlPrefix, urlPrefix); hPrintf("
    \n"); } /* static void showExamples() */ +#endif + static void showCartDump() /* for information purposes only during development, will become obsolete */ { hPrintf("

    cart dump

    "); hPrintf("
    \n");
     cartDump(cart);
     hPrintf("
    \n"); } static void doMiddle(struct cart *theCart) /* Set up globals and make web page */ { cart = theCart; measureTiming = hPrintStatus() && isNotEmpty(cartOptionalString(cart, "measureTiming")); measureTiming = TRUE; @@ -1189,37 +1148,34 @@ if (commandError) { hPrintf("

    ERROR: no such command: '%s/%s' for endpoint '%s'

    ", words[0], words[1], pathInfo); } long lastTime = clock1000(); struct trackHub *hub = errCatchTrackHubOpen(urlInput); if (measureTiming || debug) { long thisTime = clock1000(); if (debug) hPrintf("hub open time: %ld millis
    \n", thisTime - lastTime); } -// hPrintf("

    ucscDb: '%s'

    \n", ucscDb); - -struct trackHubGenome *hubGenome = hub->genomeList; - -introductionText(); +webIncludeFile("inc/dataApi.html"); -showExamples(urlInput, hubGenome, ucscDb); +// struct trackHubGenome *hubGenome = hub->genomeList; +// showExamples(urlInput, hubGenome, ucscDb); if (debug) showCartDump(); hPrintf("

    Explore hub or database assemblies and tracks

    \n"); hPrintf("
    \n\n", urlPrefix); hPrintf("Select public hub: "); #define JBUFSIZE 2048 #define SMALLBUF 256 char javascript[JBUFSIZE]; struct slPair *events = NULL; safef(javascript, sizeof(javascript), "this.lastIndex=this.selectedIndex;"); slPairAdd(&events, "focus", cloneString(javascript));