diff options
| author | Tom Lane | 2009-11-22 05:20:41 +0000 |
|---|---|---|
| committer | Tom Lane | 2009-11-22 05:20:41 +0000 |
| commit | 1753337cf5d0aa5ba04b29ded65b824d9cf12c00 (patch) | |
| tree | adefbd23fd367d32f374e9ef9188b4ef37d47820 /contrib/tsearch2 | |
| parent | 93d3bac5648bddfe195a9cecc45ef0a2da5e85a8 (diff) | |
Improve psql's tabular display of wrapped-around data by inserting markers
in the formerly-always-blank columns just to left and right of the data.
Different marking is used for a line break caused by a newline in the data
than for a straight wraparound. A newline break is signaled by a "+" in the
right margin column in ASCII mode, or a carriage return arrow in UNICODE mode.
Wraparound is signaled by a dot in the right margin as well as the following
left margin in ASCII mode, or an ellipsis symbol in the same places in UNICODE
mode. "\pset linestyle old-ascii" is added to make the previous behavior
available if anyone really wants it.
In passing, this commit also cleans up a few regression test files that
had unintended spacing differences from the current actual output.
Roger Leigh, reviewed by Gabrielle Roth and other members of PDXPUG.
Diffstat (limited to 'contrib/tsearch2')
| -rw-r--r-- | contrib/tsearch2/expected/tsearch2.out | 42 | ||||
| -rw-r--r-- | contrib/tsearch2/expected/tsearch2_1.out | 42 |
2 files changed, 42 insertions, 42 deletions
diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out index d5623e1cdbc..22d3e3e402e 100644 --- a/contrib/tsearch2/expected/tsearch2.out +++ b/contrib/tsearch2/expected/tsearch2.out @@ -742,8 +742,8 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc 3 | ewri2 12 | 13 | <a href="qwe<qwe>"> - 12 | - : + 12 | + + | 19 | /usr/local/fff 12 | 19 | /awdf/dwqe/4325 @@ -775,8 +775,8 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc 20 | -4.2 12 | . 22 | 234 - 12 | - : + 12 | + + | 12 | < 1 | i 12 | @@ -2330,8 +2330,8 @@ Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('sea&thousand&years')); headline -------------------------------------------- - <b>sea</b> a <b>thousand</b> <b>years</b>, - A <b>thousand</b> <b>years</b> to trace + <b>sea</b> a <b>thousand</b> <b>years</b>,+ + A <b>thousand</b> <b>years</b> to trace + The granite features of this cliff (1 row) @@ -2347,8 +2347,8 @@ Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('granite&sea')); headline ------------------------------------------- - <b>sea</b> a thousand years, - A thousand years to trace + <b>sea</b> a thousand years, + + A thousand years to trace + The <b>granite</b> features of this cliff (1 row) @@ -2364,8 +2364,8 @@ Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('sea')); headline ------------------------------------ - <b>sea</b> a thousand years, - A thousand years to trace + <b>sea</b> a thousand years, + + A thousand years to trace + The granite features of this cliff (1 row) @@ -2384,17 +2384,17 @@ ff-bg to_tsquery('sea&foo'), 'HighlightAll=true'); headline ----------------------------------------------------------------------------- - - <html> - <!-- some comment --> - <body> - <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i> - <a href="http://www.google.com/foo.bar.html" target="_blank">YES </a> - ff-bg - <script> - document.write(15); - </script> - </body> + + + <html> + + <!-- some comment --> + + <body> + + <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i> + + <a href="http://www.google.com/foo.bar.html" target="_blank">YES </a>+ + ff-bg + + <script> + + document.write(15); + + </script> + + </body> + </html> (1 row) diff --git a/contrib/tsearch2/expected/tsearch2_1.out b/contrib/tsearch2/expected/tsearch2_1.out index e956b07646a..f5713f5024c 100644 --- a/contrib/tsearch2/expected/tsearch2_1.out +++ b/contrib/tsearch2/expected/tsearch2_1.out @@ -742,8 +742,8 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc 3 | ewri2 12 | 13 | <a href="qwe<qwe>"> - 12 | - : + 12 | + + | 19 | /usr/local/fff 12 | 19 | /awdf/dwqe/4325 @@ -775,8 +775,8 @@ select * from parse('default', '345 qwe@efd.r '' http://www.com/ http://aew.werc 20 | -4.2 12 | . 22 | 234 - 12 | - : + 12 | + + | 12 | < 1 | i 12 | @@ -2330,8 +2330,8 @@ Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('sea&thousand&years')); headline -------------------------------------------- - <b>sea</b> a <b>thousand</b> <b>years</b>, - A <b>thousand</b> <b>years</b> to trace + <b>sea</b> a <b>thousand</b> <b>years</b>,+ + A <b>thousand</b> <b>years</b> to trace + The granite features of this cliff (1 row) @@ -2347,8 +2347,8 @@ Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('granite&sea')); headline ------------------------------------------- - <b>sea</b> a thousand years, - A thousand years to trace + <b>sea</b> a thousand years, + + A thousand years to trace + The <b>granite</b> features of this cliff (1 row) @@ -2364,8 +2364,8 @@ Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('sea')); headline ------------------------------------ - <b>sea</b> a thousand years, - A thousand years to trace + <b>sea</b> a thousand years, + + A thousand years to trace + The granite features of this cliff (1 row) @@ -2384,17 +2384,17 @@ ff-bg to_tsquery('sea&foo'), 'HighlightAll=true'); headline ----------------------------------------------------------------------------- - - <html> - <!-- some comment --> - <body> - <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i> - <a href="http://www.google.com/foo.bar.html" target="_blank">YES </a> - ff-bg - <script> - document.write(15); - </script> - </body> + + + <html> + + <!-- some comment --> + + <body> + + <b>Sea</b> view wow <u><b>foo</b> bar</u> <i>qq</i> + + <a href="http://www.google.com/foo.bar.html" target="_blank">YES </a>+ + ff-bg + + <script> + + document.write(15); + + </script> + + </body> + </html> (1 row) |