9d9f00e7ae0c4007130239f651fbc587f25f244f
hiram
  Tue Sep 24 23:02:55 2024 -0700
eliminate specific references to hgcentraltest refs #32596

diff --git src/hg/hubApi/findGenome.c src/hg/hubApi/findGenome.c
index c0ce911..1f45617 100644
--- src/hg/hubApi/findGenome.c
+++ src/hg/hubApi/findGenome.c
@@ -1,35 +1,25 @@
 /* findGenome search functions */
 
 #include "dataApi.h"
 #include "hgFind.h"
 #include "cartTrackDb.h"
 #include "cartJson.h"
 #include "genark.h"
 #include "asmAlias.h"
-#include "asmSummary.h"
 #include "assemblyList.h"
 
-struct combinedSummary
-/* may have information from any of:  asmSummary, genark or dbDb */
-    {
-    struct combinedSummary *next;	/* Next in singly linked list */
-    struct asmSummary *summary;		/* from asmSummary table */
-    struct genark *genArk;		/* from genark table */
-    struct dbDb *dbDb;			/* from dbDb table */
-    };
-
 /* will be initialized as this function begins */
 static char *genarkTable = NULL;
 static char *asmListTable = NULL;
 static boolean statsOnly = FALSE;
 /* these three are radio button states, only one of these three can be TRUE */
 static boolean browserMustExist = TRUE;	/* default: browser must exist */
 static boolean browserMayExist = FALSE;
 static boolean browserNotExist = FALSE;
 static unsigned specificYear = 0;	/* from year=1234 argument */
 /* from category= reference or representative */
 static char *refSeqCategory = NULL;
 /* from status= one of: latest, replaced or suppressed */
 static char *versionStatus = NULL;
 /* from level= one of complete, chromosome, scaffold or contig */
 static char *assemblyLevel = NULL;
@@ -305,45 +295,42 @@
 long elapsedTimeMs = nowTime - enteredMainTime;
 jsonWriteNumber(jw, "elapsedTimeMs", elapsedTimeMs);
 return elapsedTimeMs;
 }
 
 void apiFindGenome(char *pathString[MAX_PATH_INFO])
 /* 'findGenome' function */
 {
 char *searchString = cgiOptionalString(argQ);
 char *inputSearchString = cloneString(searchString);
 char *endResultSearchString = inputSearchString;
 boolean prefixSearch = FALSE;
 char *extraArgs = verifyLegalArgs(argFindGenome);
 genarkTable = genarkTableName();
 asmListTable = assemblyListTableName();
+struct sqlConnection *conn = hConnectCentral();
 
 if (extraArgs)
     apiErrAbort(err400, err400Msg, "extraneous arguments found for function /findGenome'%s'", extraArgs);
 
-boolean asmListExists = hTableExists("hgcentraltest", asmListTable);
+boolean asmListExists = sqlTableExists(conn, asmListTable);
 if (!asmListExists)
-    apiErrAbort(err400, err400Msg, "table hgcentraltest.assemblyList does not exist for /findGenome");
+    apiErrAbort(err400, err400Msg, "table central.assemblyList does not exist for /findGenome");
 
-boolean asmSummaryExists = hTableExists("hgcentraltest", "asmSummary");
-if (!asmSummaryExists)
-    apiErrAbort(err400, err400Msg, "table hgcentraltest.asmSummary does not exist for /findGenome");
-
-boolean genArkExists = hTableExists("hgcentraltest", genarkTable);
+boolean genArkExists = sqlTableExists(conn, genarkTable);
 if (!genArkExists)
-    apiErrAbort(err400, err400Msg, "table hgcentraltest.%s does not exist for /findGenome", genarkTable);
+    apiErrAbort(err400, err400Msg, "table central.%s does not exist for /findGenome", genarkTable);
 
 char *yearString = cgiOptionalString(argYear);
 char *categoryString = cgiOptionalString(argCategory);
 char *statusString = cgiOptionalString(argStatus);
 char *levelString = cgiOptionalString(argLevel);
 /* protect sqlUnsigned from errors */
 if (isNotEmpty(yearString))
     {
     struct errCatch *errCatch = errCatchNew();
     if (errCatchStart(errCatch))
 	{
         specificYear = sqlUnsigned(yearString);
         if ((specificYear < 1800) || (specificYear > 2100))
 	    apiErrAbort(err400, err400Msg, "year specified '%s' must be >= 1800 and <= 2100", yearString);
 	}
@@ -415,31 +402,30 @@
      else
 	apiErrAbort(err400, err400Msg, "unrecognized '%s=%s' argument, must be one of: mustExist, mayExist or notExist", argBrowser, browserExistString);
     }
 
 char *statsOnlyString = cgiOptionalString(argStatsOnly);
 if (isNotEmpty(statsOnlyString))
     {
     if (SETTING_IS_ON(statsOnlyString))
 	statsOnly = TRUE;
     else if (SETTING_IS_OFF(statsOnlyString))
 	statsOnly = FALSE;
     else
 	apiErrAbort(err400, err400Msg, "unrecognized '%s=%s' argument, can only be =1 or =0", argStatsOnly, statsOnlyString);
     }
 
-struct sqlConnection *conn = hConnectCentral();
 
 if (!sqlTableExists(conn, asmListTable))
     apiErrAbort(err500, err500Msg, "missing central.assemblyList table in function /findGenome'%s'", extraArgs);
 
 int wordCount = 0;
 
 /* verify number of words in search string is legal */
 wordCount = chopByWhite(searchString, NULL, 0);
 
 if (wordCount < 1)
 apiErrAbort(err400, err400Msg, "search term '%s' does not contain a word ? for function /findGenome", argQ);
 if (wordCount > 5)
 apiErrAbort(err400, err400Msg, "search term '%s=%s' should not have more than 5 words for function /findGenome", argQ, searchString);
 
 struct jsonWrite *jw = apiStartOutput();