From 0692ef30c5af1e7239f48e75f950e4aa6f470647 Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Tue, 24 Aug 2010 15:03:46 -0400 Subject: [PATCH] Tabs to spaces. --- README | 4 ++-- bucardo_ctl | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README b/README index 46d962e52..4fd061a55 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ This is version 4.5.0 of Bucardo. COPYRIGHT: ---------- - Copyright (c) 2005-2010 Greg Sabino Mullane + Copyright (c) 2005-2010 Greg Sabino Mullane This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8.3 or, @@ -26,7 +26,7 @@ REQUIREMENTS: build, test, and install the DBD::Pg module (at least 2.0.0) You must have at least one database that has Pl/Pgsql and Pl/Perl installed. - Target databases may need Pl/Pgsql. + Target databases may need Pl/Pgsql. INSTALLATION: diff --git a/bucardo_ctl b/bucardo_ctl index 7e7d00ce6..0acb371c2 100755 --- a/bucardo_ctl +++ b/bucardo_ctl @@ -4775,13 +4775,13 @@ sub generate_clause { my (@oneitem,@itemlist); for my $name (@{$items}) { $name =~ s/^\s*(.+?)\s*$/$1/; - ## Break into schema and relation - my $schema = ''; - if ($col eq 'tablename' and $name =~ s/(.+\w)\.(\w.+)/$2/) { - $schema = $1; - } + ## Break into schema and relation + my $schema = ''; + if ($col eq 'tablename' and $name =~ s/(.+\w)\.(\w.+)/$2/) { + $schema = $1; + } - my $one = 1; + my $one = 1; ## Contains: if ($name =~ s/^\*(.+)\*$/$1/) { push @oneitem => "$col ${NOTR}~ " . qquote($1); @@ -4796,24 +4796,24 @@ sub generate_clause { } else { push @itemlist => qquote($name); - $one = 0; - } - if ($schema) { - my $col2 = 'schemaname'; - my $old = $one ? pop @oneitem : pop @itemlist; - if ($schema =~ s/^\*(.+)\*$/$1/) { - push @oneitem => "($old AND $col2 ${NOTR}~ " . qquote($1) . ')'; - } - elsif ($schema =~ s/^\*(.+)/$1/) { - push @oneitem => "($old AND $col2 ${NOTR}~ " . qquote("$1\$") . ')'; - } - elsif ($schema =~ s/(.+)\*$/$1/) { - push @oneitem => "($old AND $col2 ${NOTR}~ " . qquote("^$1") . ')'; - } - else { - push @oneitem => "($col = $old AND $col2 = " . qquote($schema) . ')'; - } - } + $one = 0; + } + if ($schema) { + my $col2 = 'schemaname'; + my $old = $one ? pop @oneitem : pop @itemlist; + if ($schema =~ s/^\*(.+)\*$/$1/) { + push @oneitem => "($old AND $col2 ${NOTR}~ " . qquote($1) . ')'; + } + elsif ($schema =~ s/^\*(.+)/$1/) { + push @oneitem => "($old AND $col2 ${NOTR}~ " . qquote("$1\$") . ')'; + } + elsif ($schema =~ s/(.+)\*$/$1/) { + push @oneitem => "($old AND $col2 ${NOTR}~ " . qquote("^$1") . ')'; + } + else { + push @oneitem => "($col = $old AND $col2 = " . qquote($schema) . ')'; + } + } } if (@itemlist) { my $list = sprintf "$col ${NOT}IN (" . (join ',' => @itemlist) . ')'; -- 2.39.5