From: Sandro Santilli <strk@keybit.net>
Date: Mon, 13 Dec 2004 12:56:25 +0000 (+0000)
Subject: Handled more schema specification in 800 pg_restore output.
X-Git-Tag: pgis_1_0_0RC1~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef88caf137f41fe61ce1ddd4ce186b2bd952a41e;p=postgis

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 d7b75dc38..ae5c418f9 100644
--- 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);