X-Original-To: pgsql-interfaces-postgresql.org@localhost.postgresql.org
Received: from localhost (av.hub.org [200.46.204.144])
	by postgresql.org (Postfix) with ESMTP id 84A139DCB3E
	for <pgsql-interfaces-postgresql.org@localhost.postgresql.org>;
	Mon,  6 Feb 2006 21:23:22 -0400 (AST)
Received: from postgresql.org ([200.46.204.71])
	by localhost (av.hub.org [200.46.204.144]) (amavisd-new, port 10024)
	with ESMTP id 98822-07
	for <pgsql-interfaces-postgresql.org@localhost.postgresql.org>;
	Mon,  6 Feb 2006 21:23:25 -0400 (AST)
X-Greylist: from auto-whitelisted by SQLgrey-
Received: from candle.pha.pa.us (candle.pha.pa.us [70.90.9.53])
	by postgresql.org (Postfix) with ESMTP id 295709DCA20
	for <pgsql-interfaces@postgresql.org>;
	Mon,  6 Feb 2006 21:23:18 -0400 (AST)
Received: (from pgman@localhost)
	by candle.pha.pa.us (8.11.6/8.11.6) id k171NRA27993;
	Mon, 6 Feb 2006 20:23:27 -0500 (EST)
From: Bruce Momjian <pgman@candle.pha.pa.us>
Message-Id: <200602070123.k171NRA27993@candle.pha.pa.us>
Subject: Re: PQprint under Windows
In-Reply-To: <43E7DB7F.7030101@online.de>
To: Christoph Zwerschke <cito@online.de>
Date: Mon, 6 Feb 2006 20:23:27 -0500 (EST)
CC: pgsql-interfaces@postgresql.org
X-Mailer: ELM [version 2.4ME+ PL121 (25)]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=ELM1139275407-8023-0_
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by amavisd-new at hub.org
X-Spam-Status: No, score=0.127 required=5 tests=[AWL=0.127]
X-Spam-Score: 0.127
X-Spam-Level: 
X-Archive-Number: 200602/17
X-Sequence-Number: 5981


--ELM1139275407-8023-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

Christoph Zwerschke wrote:
> >> I also noticed that the HTML code in PQprint is not very clean and 
> >> sometimes even wrong, e.g. it has <centre> instead of <center>.
> > 
> > Fixed in 8.1.X.
> 
> As already mentioned, there is also a wrong attribute align=high and as 
> I just saw, also align=left and align=right attributes without quotes.

Here is the patchI applied based on your report.  I already fixed the
"centre" cases.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

--ELM1139275407-8023-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
Content-Disposition: inline; filename="/rtmp/diff"

Index: src/interfaces/libpq/fe-print.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v
retrieving revision 1.65
diff -c -c -r1.65 fe-print.c
*** src/interfaces/libpq/fe-print.c	6 Feb 2006 02:23:07 -0000	1.65
--- src/interfaces/libpq/fe-print.c	7 Feb 2006 00:23:54 -0000
***************
*** 256,262 ****
  			{
  				if (po->html3)
  					fprintf(fout,
! 							"<table %s><caption align=high>%d</caption>\n",
  							po->tableOpt ? po->tableOpt : "", i);
  				else
  					fprintf(fout, libpq_gettext("-- RECORD %d --\n"), i);
--- 256,262 ----
  			{
  				if (po->html3)
  					fprintf(fout,
! 							"<table %s><caption align=\"top\">%d</caption>\n",
  							po->tableOpt ? po->tableOpt : "", i);
  				else
  					fprintf(fout, libpq_gettext("-- RECORD %d --\n"), i);
***************
*** 276,287 ****
  				{
  					if (po->caption)
  						fprintf(fout,
! 							  "<table %s><caption align=high>%s</caption>\n",
  								po->tableOpt ? po->tableOpt : "",
  								po->caption);
  					else
  						fprintf(fout,
! 								"<table %s><caption align=high>"
  								"Retrieved %d rows * %d fields"
  								"</caption>\n",
  						   po->tableOpt ? po->tableOpt : "", nTups, nFields);
--- 276,287 ----
  				{
  					if (po->caption)
  						fprintf(fout,
! 							  "<table %s><caption align=\"top\">%s</caption>\n",
  								po->tableOpt ? po->tableOpt : "",
  								po->caption);
  					else
  						fprintf(fout,
! 								"<table %s><caption align=\"top\">"
  								"Retrieved %d rows * %d fields"
  								"</caption>\n",
  						   po->tableOpt ? po->tableOpt : "", nTups, nFields);
***************
*** 406,413 ****
  			{
  				if (po->html3)
  					fprintf(fout,
! 							"<tr><td align=left><b>%s</b></td>"
! 							"<td align=%s>%s</td></tr>\n",
  							fieldNames[j],
  							fieldNotNum[j] ? "left" : "right",
  							pval);
--- 406,413 ----
  			{
  				if (po->html3)
  					fprintf(fout,
! 							"<tr><td align=\"left\"><b>%s</b></td>"
! 							"<td align=\"%s\">%s</td></tr>\n",
  							fieldNames[j],
  							fieldNotNum[j] ? "left" : "right",
  							pval);
***************
*** 502,508 ****
  
  		if (po->html3)
  		{
! 			fprintf(fout, "<th align=%s>%s</th>",
  					fieldNotNum[j] ? "left" : "right", fieldNames[j]);
  		}
  		else
--- 502,508 ----
  
  		if (po->html3)
  		{
! 			fprintf(fout, "<th align=\"%s\">%s</th>",
  					fieldNotNum[j] ? "left" : "right", fieldNames[j]);
  		}
  		else
***************
*** 546,552 ****
  		char	   *p = fields[row_index * nFields + field_index];
  
  		if (po->html3)
! 			fprintf(fout, "<td align=%s>%s</td>",
  					fieldNotNum[field_index] ? "left" : "right", p ? p : "");
  		else
  		{
--- 546,552 ----
  		char	   *p = fields[row_index * nFields + field_index];
  
  		if (po->html3)
! 			fprintf(fout, "<td align=\"%s\">%s</td>",
  					fieldNotNum[field_index] ? "left" : "right", p ? p : "");
  		else
  		{

--ELM1139275407-8023-0_--