+ if (opt_table_attr)
+ fprintf(fout, " %s", opt_table_attr);
+ fputs(">\n", fout);
+
+ /* print title */
+ if (!opt_tuples_only && title)
+ {
+ fputs("
", fout);
+ html_escaped_print(title, fout);
+ fputs("\n", fout);
+ }
+ }
+
/* print records */
for (i = 0, ptr = cells; *ptr; i++, ptr++)
{
if (cancel_pressed)
break;
if (!opt_tuples_only)
- fprintf(fout, "\n
Record %d
\n", record++);
+ fprintf(fout,
+ "\n
Record %lu
\n",
+ record++);
else
fputs("\n
\n", fout);
}
fputs("\n \n", fout);
}
- fputs("\n", fout);
-
- /* print footers */
- if (!opt_tuples_only && footers && *footers && !cancel_pressed)
+ if (opt->stop_table)
{
- for (ptr = footers; *ptr; ptr++)
+ fputs("\n", fout);
+
+ /* print footers */
+ if (!opt_tuples_only && footers && *footers && !cancel_pressed)
{
- html_escaped_print(*ptr, fout);
- fputs("\n", fout);
+ for (ptr = footers; *ptr; ptr++)
+ {
+ html_escaped_print(*ptr, fout);
+ fputs("\n", fout);
+ }
+ fputs("", fout);
}
- fputs("", fout);
+
+ fputc('\n', fout);
}
- fputc('\n', fout);
}
-
/*************************/
-/* LaTeX */
+/* LaTeX */
/*************************/
}
-
static void
print_latex_text(const char *title, const char *const * headers,
const char *const * cells, const char *const * footers,
- const char *opt_align, bool opt_tuples_only,
- bool opt_numeric_locale, unsigned short int opt_border,
+ const char *opt_align, const printTableOpt *opt,
FILE *fout)
{
+ bool opt_tuples_only = opt->tuples_only;
+ bool opt_numeric_locale = opt->numericLocale;
+ unsigned short int opt_border = opt->border;
unsigned int col_count = 0;
unsigned int i;
const char *const * ptr;
if (cancel_pressed)
return;
- /* print title */
- if (!opt_tuples_only && title)
- {
- fputs("\\begin{center}\n", fout);
- latex_escaped_print(title, fout);
- fputs("\n\\end{center}\n\n", fout);
- }
+ if (opt_border > 2)
+ opt_border = 2;
/* count columns */
for (ptr = headers; *ptr; ptr++)
col_count++;
- /* begin environment and set alignments and borders */
- fputs("\\begin{tabular}{", fout);
-
- if (opt_border == 2)
- fputs("| ", fout);
- for (i = 0; i < col_count; i++)
+ if (opt->start_table)
{
- fputc(*(opt_align + i), fout);
- if (opt_border != 0 && i < col_count - 1)
- fputs(" | ", fout);
- }
- if (opt_border == 2)
- fputs(" |", fout);
+ /* print title */
+ if (!opt_tuples_only && title)
+ {
+ fputs("\\begin{center}\n", fout);
+ latex_escaped_print(title, fout);
+ fputs("\n\\end{center}\n\n", fout);
+ }
- fputs("}\n", fout);
+ /* begin environment and set alignments and borders */
+ fputs("\\begin{tabular}{", fout);
- if (!opt_tuples_only && opt_border == 2)
- fputs("\\hline\n", fout);
+ if (opt_border == 2)
+ fputs("| ", fout);
+ for (i = 0; i < col_count; i++)
+ {
+ fputc(*(opt_align + i), fout);
+ if (opt_border != 0 && i < col_count - 1)
+ fputs(" | ", fout);
+ }
+ if (opt_border == 2)
+ fputs(" |", fout);
- /* print headers and count columns */
- for (i = 0, ptr = headers; i < col_count; i++, ptr++)
- {
+ fputs("}\n", fout);
+
+ if (!opt_tuples_only && opt_border == 2)
+ fputs("\\hline\n", fout);
+
+ /* print headers */
if (!opt_tuples_only)
{
- if (i != 0)
- fputs(" & ", fout);
- fputs("\\textit{", fout);
- latex_escaped_print(*ptr, fout);
- fputc('}', fout);
+ for (i = 0, ptr = headers; i < col_count; i++, ptr++)
+ {
+ if (i != 0)
+ fputs(" & ", fout);
+ fputs("\\textit{", fout);
+ latex_escaped_print(*ptr, fout);
+ fputc('}', fout);
+ }
+ fputs(" \\\\\n", fout);
+ fputs("\\hline\n", fout);
}
}
- if (!opt_tuples_only)
- {
- fputs(" \\\\\n", fout);
- fputs("\\hline\n", fout);
- }
-
/* print cells */
for (i = 0, ptr = cells; *ptr; i++, ptr++)
{
fputs(" & ", fout);
}
- if (opt_border == 2)
- fputs("\\hline\n", fout);
-
- fputs("\\end{tabular}\n\n\\noindent ", fout);
-
+ if (opt->stop_table)
+ {
+ if (opt_border == 2)
+ fputs("\\hline\n", fout);
- /* print footers */
+ fputs("\\end{tabular}\n\n\\noindent ", fout);
- if (footers && !opt_tuples_only && !cancel_pressed)
- for (ptr = footers; *ptr; ptr++)
+ /* print footers */
+ if (footers && !opt_tuples_only && !cancel_pressed)
{
- latex_escaped_print(*ptr, fout);
- fputs(" \\\\\n", fout);
+ for (ptr = footers; *ptr; ptr++)
+ {
+ latex_escaped_print(*ptr, fout);
+ fputs(" \\\\\n", fout);
+ }
}
- fputc('\n', fout);
+ fputc('\n', fout);
+ }
}
-
static void
print_latex_vertical(const char *title, const char *const * headers,
const char *const * cells, const char *const * footers,
- const char *opt_align, bool opt_tuples_only,
- bool opt_numeric_locale, unsigned short int opt_border,
+ const char *opt_align, const printTableOpt *opt,
FILE *fout)
{
+ bool opt_tuples_only = opt->tuples_only;
+ bool opt_numeric_locale = opt->numericLocale;
+ unsigned short int opt_border = opt->border;
unsigned int col_count = 0;
+ unsigned long record = opt->prior_records + 1;
unsigned int i;
const char *const * ptr;
- unsigned int record = 1;
(void) opt_align; /* currently unused parameter */
if (cancel_pressed)
return;
- /* print title */
- if (!opt_tuples_only && title)
- {
- fputs("\\begin{center}\n", fout);
- latex_escaped_print(title, fout);
- fputs("\n\\end{center}\n\n", fout);
- }
-
- /* begin environment and set alignments and borders */
- fputs("\\begin{tabular}{", fout);
- if (opt_border == 0)
- fputs("cl", fout);
- else if (opt_border == 1)
- fputs("c|l", fout);
- else if (opt_border == 2)
- fputs("|c|l|", fout);
- fputs("}\n", fout);
-
+ if (opt_border > 2)
+ opt_border = 2;
/* count columns */
for (ptr = headers; *ptr; ptr++)
col_count++;
+ if (opt->start_table)
+ {
+ /* print title */
+ if (!opt_tuples_only && title)
+ {
+ fputs("\\begin{center}\n", fout);
+ latex_escaped_print(title, fout);
+ fputs("\n\\end{center}\n\n", fout);
+ }
+
+ /* begin environment and set alignments and borders */
+ fputs("\\begin{tabular}{", fout);
+ if (opt_border == 0)
+ fputs("cl", fout);
+ else if (opt_border == 1)
+ fputs("c|l", fout);
+ else if (opt_border == 2)
+ fputs("|c|l|", fout);
+ fputs("}\n", fout);
+ }
/* print records */
for (i = 0, ptr = cells; *ptr; i++, ptr++)
if (opt_border == 2)
{
fputs("\\hline\n", fout);
- fprintf(fout, "\\multicolumn{2}{|c|}{\\textit{Record %d}} \\\\\n", record++);
+ fprintf(fout, "\\multicolumn{2}{|c|}{\\textit{Record %lu}} \\\\\n", record++);
}
else
- fprintf(fout, "\\multicolumn{2}{c}{\\textit{Record %d}} \\\\\n", record++);
+ fprintf(fout, "\\multicolumn{2}{c}{\\textit{Record %lu}} \\\\\n", record++);
}
if (opt_border >= 1)
fputs("\\hline\n", fout);
fputs(" \\\\\n", fout);
}
- if (opt_border == 2)
- fputs("\\hline\n", fout);
-
- fputs("\\end{tabular}\n\n\\noindent ", fout);
-
+ if (opt->stop_table)
+ {
+ if (opt_border == 2)
+ fputs("\\hline\n", fout);
- /* print footers */
+ fputs("\\end{tabular}\n\n\\noindent ", fout);
- if (footers && !opt_tuples_only && !cancel_pressed)
- for (ptr = footers; *ptr; ptr++)
+ /* print footers */
+ if (footers && !opt_tuples_only && !cancel_pressed)
{
- if (opt_numeric_locale)
+ for (ptr = footers; *ptr; ptr++)
{
- char *my_cell = format_numeric_locale(*ptr);
+ if (opt_numeric_locale)
+ {
+ char *my_cell = format_numeric_locale(*ptr);
- latex_escaped_print(my_cell, fout);
- free(my_cell);
+ latex_escaped_print(my_cell, fout);
+ free(my_cell);
+ }
+ else
+ latex_escaped_print(*ptr, fout);
+ fputs(" \\\\\n", fout);
}
- else
- latex_escaped_print(*ptr, fout);
- fputs(" \\\\\n", fout);
}
- fputc('\n', fout);
+ fputc('\n', fout);
+ }
}
-
/*************************/
/* Troff -ms */
/*************************/
}
-
static void
print_troff_ms_text(const char *title, const char *const * headers,
const char *const * cells, const char *const * footers,
- const char *opt_align, bool opt_tuples_only,
- bool opt_numeric_locale, unsigned short int opt_border,
+ const char *opt_align, const printTableOpt *opt,
FILE *fout)
{
+ bool opt_tuples_only = opt->tuples_only;
+ bool opt_numeric_locale = opt->numericLocale;
+ unsigned short int opt_border = opt->border;
unsigned int col_count = 0;
unsigned int i;
const char *const * ptr;
if (cancel_pressed)
return;
- /* print title */
- if (!opt_tuples_only && title)
- {
- fputs(".LP\n.DS C\n", fout);
- troff_ms_escaped_print(title, fout);
- fputs("\n.DE\n", fout);
- }
+ if (opt_border > 2)
+ opt_border = 2;
/* count columns */
for (ptr = headers; *ptr; ptr++)
col_count++;
- /* begin environment and set alignments and borders */
- fputs(".LP\n.TS\n", fout);
- if (opt_border == 2)
- fputs("center box;\n", fout);
- else
- fputs("center;\n", fout);
-
- for (i = 0; i < col_count; i++)
+ if (opt->start_table)
{
- fputc(*(opt_align + i), fout);
- if (opt_border > 0 && i < col_count - 1)
- fputs(" | ", fout);
- }
- fputs(".\n", fout);
+ /* print title */
+ if (!opt_tuples_only && title)
+ {
+ fputs(".LP\n.DS C\n", fout);
+ troff_ms_escaped_print(title, fout);
+ fputs("\n.DE\n", fout);
+ }
- /* print headers and count columns */
- for (i = 0, ptr = headers; i < col_count; i++, ptr++)
- {
+ /* begin environment and set alignments and borders */
+ fputs(".LP\n.TS\n", fout);
+ if (opt_border == 2)
+ fputs("center box;\n", fout);
+ else
+ fputs("center;\n", fout);
+
+ for (i = 0; i < col_count; i++)
+ {
+ fputc(*(opt_align + i), fout);
+ if (opt_border > 0 && i < col_count - 1)
+ fputs(" | ", fout);
+ }
+ fputs(".\n", fout);
+
+ /* print headers */
if (!opt_tuples_only)
{
- if (i != 0)
- fputc('\t', fout);
- fputs("\\fI", fout);
- troff_ms_escaped_print(*ptr, fout);
- fputs("\\fP", fout);
+ for (i = 0, ptr = headers; i < col_count; i++, ptr++)
+ {
+ if (i != 0)
+ fputc('\t', fout);
+ fputs("\\fI", fout);
+ troff_ms_escaped_print(*ptr, fout);
+ fputs("\\fP", fout);
+ }
+ fputs("\n_\n", fout);
}
}
- if (!opt_tuples_only)
- fputs("\n_\n", fout);
-
/* print cells */
for (i = 0, ptr = cells; *ptr; i++, ptr++)
{
fputc('\t', fout);
}
- fputs(".TE\n.DS L\n", fout);
-
-
- /* print footers */
+ if (opt->stop_table)
+ {
+ fputs(".TE\n.DS L\n", fout);
- if (footers && !opt_tuples_only && !cancel_pressed)
- for (ptr = footers; *ptr; ptr++)
- {
- troff_ms_escaped_print(*ptr, fout);
- fputc('\n', fout);
- }
+ /* print footers */
+ if (footers && !opt_tuples_only && !cancel_pressed)
+ for (ptr = footers; *ptr; ptr++)
+ {
+ troff_ms_escaped_print(*ptr, fout);
+ fputc('\n', fout);
+ }
- fputs(".DE\n", fout);
+ fputs(".DE\n", fout);
+ }
}
-
static void
print_troff_ms_vertical(const char *title, const char *const * headers,
- const char *const * cells, const char *const * footers,
- const char *opt_align, bool opt_tuples_only,
- bool opt_numeric_locale, unsigned short int opt_border,
+ const char *const * cells, const char *const * footers,
+ const char *opt_align, const printTableOpt *opt,
FILE *fout)
{
+ bool opt_tuples_only = opt->tuples_only;
+ bool opt_numeric_locale = opt->numericLocale;
+ unsigned short int opt_border = opt->border;
unsigned int col_count = 0;
+ unsigned long record = opt->prior_records + 1;
unsigned int i;
const char *const * ptr;
- unsigned int record = 1;
unsigned short current_format = 0; /* 0=none, 1=header, 2=body */
(void) opt_align; /* currently unused parameter */
if (cancel_pressed)
return;
- /* print title */
- if (!opt_tuples_only && title)
- {
- fputs(".LP\n.DS C\n", fout);
- troff_ms_escaped_print(title, fout);
- fputs("\n.DE\n", fout);
- }
-
- /* begin environment and set alignments and borders */
- fputs(".LP\n.TS\n", fout);
- if (opt_border == 2)
- fputs("center box;\n", fout);
- else
- fputs("center;\n", fout);
-
- /* basic format */
- if (opt_tuples_only)
- fputs("c l;\n", fout);
+ if (opt_border > 2)
+ opt_border = 2;
/* count columns */
for (ptr = headers; *ptr; ptr++)
col_count++;
+ if (opt->start_table)
+ {
+ /* print title */
+ if (!opt_tuples_only && title)
+ {
+ fputs(".LP\n.DS C\n", fout);
+ troff_ms_escaped_print(title, fout);
+ fputs("\n.DE\n", fout);
+ }
+
+ /* begin environment and set alignments and borders */
+ fputs(".LP\n.TS\n", fout);
+ if (opt_border == 2)
+ fputs("center box;\n", fout);
+ else
+ fputs("center;\n", fout);
+
+ /* basic format */
+ if (opt_tuples_only)
+ fputs("c l;\n", fout);
+ }
+ else
+ current_format = 2; /* assume tuples printed already */
+
/* print records */
for (i = 0, ptr = cells; *ptr; i++, ptr++)
{
{
if (current_format != 1)
{
- if (opt_border == 2 && i > 0)
+ if (opt_border == 2 && record > 1)
fputs("_\n", fout);
if (current_format != 0)
fputs(".T&\n", fout);
fputs("c s.\n", fout);
current_format = 1;
}
- fprintf(fout, "\\fIRecord %d\\fP\n", record++);
+ fprintf(fout, "\\fIRecord %lu\\fP\n", record++);
}
if (opt_border >= 1)
fputs("_\n", fout);
fputc('\n', fout);
}
- fputs(".TE\n.DS L\n", fout);
-
-
- /* print footers */
+ if (opt->stop_table)
+ {
+ fputs(".TE\n.DS L\n", fout);
- if (footers && !opt_tuples_only && !cancel_pressed)
- for (ptr = footers; *ptr; ptr++)
- {
- troff_ms_escaped_print(*ptr, fout);
- fputc('\n', fout);
- }
+ /* print footers */
+ if (footers && !opt_tuples_only && !cancel_pressed)
+ for (ptr = footers; *ptr; ptr++)
+ {
+ troff_ms_escaped_print(*ptr, fout);
+ fputc('\n', fout);
+ }
- fputs(".DE\n", fout);
+ fputs(".DE\n", fout);
+ }
}
-
/********************************/
/* Public functions */
/********************************/
)
{
const char *pagerprog;
+ FILE *pagerpipe;
#ifdef TIOCGWINSZ
int result;
#ifndef WIN32
pqsignal(SIGPIPE, SIG_IGN);
#endif
- return popen(pagerprog, "w");
+ pagerpipe = popen(pagerprog, "w");
+ if (pagerpipe)
+ return pagerpipe;
#ifdef TIOCGWINSZ
}
#endif
return stdout;
}
+/*
+ * ClosePager
+ *
+ * Close previously opened pager pipe, if any
+ */
+void
+ClosePager(FILE *pagerpipe)
+{
+ if (pagerpipe && pagerpipe != stdout)
+ {
+ /*
+ * If printing was canceled midstream, warn about it.
+ *
+ * Some pagers like less use Ctrl-C as part of their command
+ * set. Even so, we abort our processing and warn the user
+ * what we did. If the pager quit as a result of the
+ * SIGINT, this message won't go anywhere ...
+ */
+ if (cancel_pressed)
+ fprintf(pagerpipe, _("Interrupted\n"));
+
+ pclose(pagerpipe);
+#ifndef WIN32
+ pqsignal(SIGPIPE, SIG_DFL);
+#endif
+ }
+}
void
const char *align,
const printTableOpt *opt, FILE *fout, FILE *flog)
{
- const char *default_footer[] = {NULL};
- unsigned short int border = opt->border;
+ static const char *default_footer[] = {NULL};
FILE *output;
- bool use_expanded;
if (cancel_pressed)
return;
if (!footers)
footers = default_footer;
- if (opt->format != PRINT_HTML && border > 2)
- border = 2;
-
- /*
- * We only want to display the results in "expanded" format if this is a
- * normal (user-submitted) query, not a table we're printing for a slash
- * command.
- */
- if (opt->expanded)
- use_expanded = true;
- else
- use_expanded = false;
-
if (fout == stdout)
{
int col_count = 0,
/* print the stuff */
if (flog)
- print_aligned_text(title, headers, cells, footers, align, opt->tuples_only, opt->numericLocale, border, opt->encoding, flog);
+ print_aligned_text(title, headers, cells, footers, align,
+ opt, flog);
switch (opt->format)
{
case PRINT_UNALIGNED:
- if (use_expanded)
+ if (opt->expanded)
print_unaligned_vertical(title, headers, cells, footers, align,
- opt->fieldSep, opt->recordSep,
- opt->tuples_only, opt->numericLocale, output);
+ opt, output);
else
print_unaligned_text(title, headers, cells, footers, align,
- opt->fieldSep, opt->recordSep,
- opt->tuples_only, opt->numericLocale, output);
+ opt, output);
break;
case PRINT_ALIGNED:
- if (use_expanded)
+ if (opt->expanded)
print_aligned_vertical(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale, border,
- opt->encoding, output);
+ opt, output);
else
print_aligned_text(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale,
- border, opt->encoding, output);
+ opt, output);
break;
case PRINT_HTML:
- if (use_expanded)
+ if (opt->expanded)
print_html_vertical(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale,
- border, opt->tableAttr, output);
+ opt, output);
else
- print_html_text(title, headers, cells, footers,
- align, opt->tuples_only, opt->numericLocale, border,
- opt->tableAttr, output);
+ print_html_text(title, headers, cells, footers, align,
+ opt, output);
break;
case PRINT_LATEX:
- if (use_expanded)
+ if (opt->expanded)
print_latex_vertical(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale,
- border, output);
+ opt, output);
else
print_latex_text(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale,
- border, output);
+ opt, output);
break;
case PRINT_TROFF_MS:
- if (use_expanded)
+ if (opt->expanded)
print_troff_ms_vertical(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale,
- border, output);
+ opt, output);
else
print_troff_ms_text(title, headers, cells, footers, align,
- opt->tuples_only, opt->numericLocale,
- border, output);
+ opt, output);
break;
default:
fprintf(stderr, _("invalid output format (internal error): %d"), opt->format);
}
/* Only close if we used the pager */
- if (fout == stdout && output != stdout)
- {
- /*
- * If printing was canceled midstream, warn about it.
- *
- * Some pagers like less use Ctrl-C as part of their command
- * set. Even so, we abort our processing and warn the user
- * what we did. If the pager quit as a result of the
- * SIGINT, this message won't go anywhere ...
- */
- if (cancel_pressed)
- fprintf(output, _("Interrupted\n"));
-
- pclose(output);
-#ifndef WIN32
- pqsignal(SIGPIPE, SIG_DFL);
-#endif
- }
+ if (output != fout)
+ ClosePager(output);
}
-
void
printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *flog)
{
footers = opt->footers;
else if (!opt->topt.expanded && opt->default_footer)
{
- footers = pg_local_calloc(2, sizeof(*footers));
+ unsigned long total_records;
+ footers = pg_local_calloc(2, sizeof(*footers));
footers[0] = pg_local_malloc(100);
- if (PQntuples(result) == 1)
+ total_records = opt->topt.prior_records + PQntuples(result);
+ if (total_records == 1)
snprintf(footers[0], 100, _("(1 row)"));
else
- snprintf(footers[0], 100, _("(%d rows)"), PQntuples(result));
+ snprintf(footers[0], 100, _("(%lu rows)"), total_records);
}
else
footers = NULL;
projects / postgresql.git / commitdiff