From 7afe2ed70e210a9e7c13dae2b3d417a7e6a45655 Mon Sep 17 00:00:00 2001 From: linuxpoet Date: Fri, 6 Apr 2007 22:27:58 +0000 Subject: Change pg_dump to use -Fc which is auto compressed, eliminating need for LedgerSMB::Gzip git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1034 4979c152-3d1c-0410-bac9-87ea11338e46 --- LedgerSMB/AM.pm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/LedgerSMB/AM.pm b/LedgerSMB/AM.pm index fb4794f4..aea71518 100755 --- a/LedgerSMB/AM.pm +++ b/LedgerSMB/AM.pm @@ -1623,11 +1623,7 @@ sub backup { my $suffix = ""; if ($form->{media} eq 'email') { - if (${LedgerSMB::Sysconfig::gzip}){ - print OUT `pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} $myconfig->{dbname} | ${LedgerSMB::Sysconfig::gzip}`; - } else { - print OUT `pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} $myconfig->{dbname}`; - } + print OUT `pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} -Fc $myconfig->{dbname}`; close OUT; use LedgerSMB::Mailer; $mail = new Mailer; @@ -1639,7 +1635,7 @@ sub backup { $mail->{version} = $form->{version}; $mail->{fileid} = "$boundary."; $mail->{format} = "plain"; - $mail->{format} = "octet-stream" if ${LedgerSMB::Sysconfig::gzip}; + $mail->{format} = "octet-stream"; $myconfig->{signature} =~ s/\\n/\n/g; $mail->{message} = "-- \n$myconfig->{signature}"; @@ -1654,11 +1650,7 @@ sub backup { print OUT qq|Content-Type: application/file;\n| . qq|Content-Disposition: attachment; filename="$myconfig->{dbname}-$form->{dbversion}-$t[5]$t[4]$t[3].sql$suffix"\n\n|; - if (${LedgerSMB::Sysconfig::gzip}){ - print OUT `pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} $myconfig->{dbname} | ${LedgerSMB::Sysconfig::gzip}`; - } else { - print OUT `pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} $myconfig->{dbname}`; - } + print OUT `pg_dump -U $myconfig->{dbuser} -h $myconfig->{dbhost} -Fc $myconfig->{dbname}`; } -- cgit v1.2.3