From ef88caf137f41fe61ce1ddd4ce186b2bd952a41e Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 13 Dec 2004 12:56:25 +0000 Subject: [PATCH] Handled more schema specification in 800 pg_restore output. git-svn-id: http://svn.osgeo.org/postgis/trunk@1136 b70326c6-7e19-0410-871a-916f4a2858ee --- utils/postgis_restore.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl index d7b75dc38..ae5c418f9 100644 --- a/utils/postgis_restore.pl +++ b/utils/postgis_restore.pl @@ -142,6 +142,7 @@ while( my $line = ) if ($line =~ /^create aggregate *([^ ]*) *\(/i) { my $name = lc($1); + $name =~ s/^public.//; my $type = undef; while( my $subline = ) { @@ -358,7 +359,7 @@ while( my $line = ) print "KEEPING FUNCTION: [$id]\n" if $DEBUG; #next; } - elsif ($line =~ / AGGREGATE (.*)\((.*)\)/) + elsif ($line =~ /CREATE .* AGGREGATE (.*)\((.*)\)/) { my $name = $1; my @args = split(",", $2); @@ -401,6 +402,7 @@ while( my $line = ) elsif ($line =~ / TYPE (.*) .*/) { my $type = lc($1); + $type =~ s/^public.//; if ( $type eq 'wkb' ) { print "SKIPPING PGIS TYPE $type\n" if $DEBUG; @@ -432,7 +434,7 @@ while( my $line = ) #next; } - elsif ($line =~ / OPERATOR CLASS *([^ ]*)/) + elsif ($line =~ /CREATE .* OPERATOR CLASS *([^ ]*)/) { my $id = lc($1); -- 2.50.1