Fixed a bug in ascii dump "CREATE OPERATOR" scan

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

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index 417bd6f193b29732fb456504aa2b7104b7a9f7af..af7c21efbbc4c874868c52938f8a7fb04010f41f 100644 (file)
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -150,7 +150,7 @@ while( my $line = <INPUT>)
                                $type = $1;
                                last;
                        }
-                       last if $subline =~ /\);/;
+                       last if $subline =~ /;[\t ]*$/;
                }
                if ( $type eq undef )
                {
@@ -223,7 +223,7 @@ while( my $line = <INPUT>)
                my $rarg = undef;
                while( my $subline = <INPUT>)
                {
-                       last if $subline =~ /\);/;
+                       last if $subline =~ /;[\t ]*$/;
                        if ( $subline =~ /leftarg *= *([^ ,]*)/i )
                        {
                                $larg=lc($1);
@@ -465,7 +465,7 @@ while( my $line = <INPUT> )
                while( my $subline = <INPUT>)
                {
                        push(@sublines, $subline);
-                       last if $subline =~ /\);/;
+                       last if $subline =~ /;[\t ]*$/;
                        if ( $subline =~ /leftarg *= *([^ ,]*)/i )
                        {
                                $larg=lc($1);
@@ -485,6 +485,7 @@ while( my $line = <INPUT> )
                }
                print "KEEPING OP $id\n" if $DEBUG;
                print OUTPUT @sublines;
+               next;
        }
 
        print OUTPUT $line;