michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use HTML format output from pgsql

Browse Source
This commit is contained in:
Jamie Cameron
2007-04-29 05:13:08 +00:00
parent 5f4c35400a
commit 9c46421110
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postgresql/CHANGELOG
View File

@@ -52,3 +52,5 @@ Added access control options to prevent the viewing and management of views, seq
Updated the module to run on Windows, and created a default configuration that will sort with the PostgreSQL 8.2 Windows install.
---- Changes since 1.320 ----
When there are too many databases or tables to display, a menu for editing a specific one is displayed in addition to the search field.
---- Changes since 1.340 ----
Use HTML format output from the pgsql command, to handle queries for rows containing newlines and special characters.

54
postgresql/postgresql-lib.pl
View File

@@ -373,7 +373,7 @@ else {
# Call the psql program
local $host = $config{'host'} ? "-h $config{'host'}" : "";
$host .= " -p $config{'port'}" if ($config{'port'});
local $cmd = &quote_path($config{'psql'}).
local $cmd = &quote_path($config{'psql'})." --html".
(!&supports_pgpass() ? " -u" : " -U $postgres_login").
" -c ".&quote_path($sql)." $host $_[0]";
if ($postgres_sameunix && defined(getpwnam($postgres_login))) {
@@ -411,44 +411,26 @@ else {
"<tt>$config{'psql'} failed</tt>"));
}
else {
local $dash = <OUT>;
if ($dash =~ /^\s*\+\-/) {
# mysql-style output
$line = <OUT>;
$line =~ s/^[\s\|]+//; $line =~ s/[\s\|]+$//;
local @titles = split(/\|/, $line);
map { s/^\s+//; s/\s+$// } @titles;
$line = <OUT>; # skip useless dashes
while(1) {
$line = <OUT>;
last if (!$line || $line =~ /^\s*\+/);
$line =~ s/^[\s\|]+//;
$line =~ s/[\s\|]+$//;
local @row = split(/\|/, $line);
map { s/^\s+//; s/\s+$// } @row;
push(@data, \@row);
# Read HTML-format output
local $row;
local @data;
while($line = <OUT>) {
if ($line =~ /^\s*<tr>/) {
# Start of a row
$row = [ ];
}
$rv = { 'titles' => \@titles, 'data' => \@data };
}
elsif ($dash !~ /^-/) {
# no output, such as from an insert
$rv = undef;
}
else {
# psql-style output
local @titles = split(/\|/, $line);
map { s/^\s+//; s/\s+$// } @titles;
while(1) {
$line = <OUT>;
last if (!$line ||
$line =~ /^\(\d+\s+\S+\)/);
local @row = split(/\|/, $line);
map { s/^\s+//; s/\s+$// } @row;
push(@data, \@row);
elsif ($line =~ /^\s*<\/tr>/) {
# End of a row
push(@data, $row);
$row = undef;
}
elsif ($line =~ /^\s*<(td|th)[^>]*>([^<]*)<\/(td|th)>/) {
# Value in a row
push(@$row, &entities_to_ascii("$2"));
}
$rv = { 'titles' => \@titles,
'data' => \@data };
}
$rv = { 'titles' => shift(@data),
'data' => \@data };
}
close(OUT);
return $rv;