Handled more schema specification in 800 pg_restore output.

git-svn-id: http://svn.osgeo.org/postgis/trunk@1136 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index d7b75dc387c0afe0a959678942b7a53d27158e66..ae5c418f92a538c725ed70142f5e543b930e1b88 100644 (file)
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -142,6 +142,7 @@ while( my $line = <INPUT>)
        if ($line =~ /^create aggregate *([^ ]*) *\(/i)
        {
                my $name = lc($1);
+               $name =~ s/^public.//;
                my $type = undef;
                while( my $subline = <INPUT>)
                {
@@ -358,7 +359,7 @@ while( my $line = <INPUT> )
                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 = <INPUT> )
        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 = <INPUT> )
                #next;
        }
 
-       elsif ($line =~ / OPERATOR CLASS *([^ ]*)/)
+       elsif ($line =~ /CREATE .* OPERATOR CLASS *([^ ]*)/)
        {
                my $id = lc($1);