552323a3e16f1f855612c99aa6ffd08755c8e6cd larrym Thu Mar 22 15:11:18 2012 -0700 use cgiString to simplify code diff --git src/hg/hgApi/hgApi.c src/hg/hgApi/hgApi.c index 2154345..a50b88b 100644 --- src/hg/hgApi/hgApi.c +++ src/hg/hgApi/hgApi.c @@ -138,43 +138,34 @@ { puts("Status: 400\n\n"); vfprintf(stdout, format, args); exit(-1); } int main(int argc, char *argv[]) { struct dyString *output = newDyString(10000); cgiSpoof(&argc,argv); pushWarnHandler(warnAbortHandler); pushAbortHandler(warnAbortHandler); char *database = cgiString("db"); -char *cmd = cgiOptionalString("cmd"); +char *cmd = cgiString("cmd"); char *jsonp = cgiOptionalString("jsonp"); -if (database) - { - database = sqlEscapeString(database); if (!hDbExists(database)) - errAbort("Invalid database"); - } -else - errAbort("Missing 'db' parameter"); - -if (!cmd) - errAbort("Missing 'cmd' parameter"); + errAbort("Invalid database '%s'", database); if (!strcmp(cmd, "defaultPos")) { dyStringPrintf(output, "{\"pos\": \"%s\"}", hDefaultPos(database)); } else if (!strcmp(cmd, "metaDb")) { // Return list of values for given metaDb var // e.g. http://genome.ucsc.edu/hgApi?db=hg18&cmd=metaDb&var=cell struct sqlConnection *conn = hAllocConn(database); boolean metaDbExists = sqlTableExists(conn, "metaDb"); if (metaDbExists) { char *var = cgiOptionalString("var");