reduced psql invocation to a single one.

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

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index 6fcae7830463c16d2e84de8254887118d4e972cc..f7a20968dcbeb61edb6272e4f52ad0f126d5bb21 100644 (file)
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -367,12 +367,22 @@ print "Creating db ($dbname)\n";
 `createdb $dbname`;
 print "Adding plpgsql\n";
 `createlang plpgsql $dbname`;
+
+open( PSQL, "| psql $dbname") || die "Can't run psql\n";
 print "Sourcing $postgissql\n";
-`psql -f $postgissql $dbname`;
+#`psql -f $postgissql $dbname`;
+open(INPUT, "<$postgissql") || die "Can't read $postgissql\n";
+while(<INPUT>) { print PSQL; }
+close(INPUT);
 print "Dropping geometry_columns and spatial_ref_sys\n";
-`psql -c "drop table geometry_columns; drop table spatial_ref_sys;" $dbname`;
+#`psql -c "drop table geometry_columns; drop table spatial_ref_sys;" $dbname`;
+print PSQL "DROP TABLE geometry_columns;";
+print PSQL "DROP TABLE spatial_ref_sys;";
 print "Restoring ascii dump $dumpascii\n";
-`psql -f $dumpascii $dbname`;
+#`psql -f $dumpascii $dbname`;
+open(INPUT, "<$dumpascii") || die "Can't read $postgissql\n";
+while(<INPUT>) { print PSQL; }
+close(INPUT);
 exit;