5989b19de3e612c79c9433c49b75d62b5ce538ea
larrym
Thu Jun 28 12:53:52 2012 -0700
use isErrAbortInProgress to avoid turning other people's warn's to errAbort's
diff --git src/hg/hgTables/hgTables.c src/hg/hgTables/hgTables.c
index 73675cf..e1f5ee8 100644
--- src/hg/hgTables/hgTables.c
+++ src/hg/hgTables/hgTables.c
@@ -136,44 +136,46 @@
stripHtmlTags(s);
eraseTrailingSpaces(s);
r = replaceChars(s, " ", " ");
hPrintf("
%s%s | ", r, extra);
freeMem(s);
freeMem(r);
}
static void earlyAbortHandler(char *format, va_list args)
{
// provide more explicit message when we run out of memory (#5147).
popWarnHandler();
if(strstr(format, "needLargeMem:") || strstr(format, "carefulAlloc:"))
format = "Region selected is too large for calculation. Please specify a smaller region or try limiting to fewer data points.";
vaWarn(format, args);
+if(isErrAbortInProgress())
noWarnAbort();
}
static void errAbortHandler(char *format, va_list args)
{
// provide more explicit message when we run out of memory (#5147).
if(strstr(format, "needLargeMem:") || strstr(format, "carefulAlloc:"))
htmlVaWarn("Region selected is too large for calculation. Please specify a smaller region or try limiting to fewer data points.", args);
else
{
// call previous handler
popWarnHandler();
vaWarn(format, args);
}
+if(isErrAbortInProgress())
noWarnAbort();
}
static void vaHtmlOpen(char *format, va_list args)
/* Start up a page that will be in html format. */
{
puts("Content-Type:text/html\n");
cartVaWebStart(cart, database, format, args);
pushWarnHandler(errAbortHandler);
}
void htmlOpen(char *format, ...)
/* Start up a page that will be in html format. */
{
va_list args;