Log Message:
-----------
These scripts were at one point generating multiple slonik
scripts to set up clusters/sets.

As they only generate a single script, they now do so via one
opening of files, and don't bother having multiple preambles

Modified Files:
--------------
    slony1-engine/tools/altperl:
        init_cluster.pl (r1.5 -> r1.6)
        create_set.pl (r1.7 -> r1.8)

-------------- next part --------------
Index: create_set.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/create_set.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ltools/altperl/create_set.pl -Ltools/altperl/create_set.pl -u -w -r1.7 -r1.8
--- tools/altperl/create_set.pl
+++ tools/altperl/create_set.pl
@@ -28,12 +28,6 @@
 		);
 ";
 }
-close OUTFILE;
-run_slonik_script($OUTPUTFILE);
-
-open (OUTFILE, ">$OUTPUTFILE");
-print OUTFILE genheader();
-
 print OUTFILE "
 try {
       create set (id = $set, origin = $MASTERNODE, comment = 'Set $set for $SETNAME');
@@ -42,12 +36,6 @@
       exit -1;
 }
 ";
-
-close OUTFILE;
-run_slonik_script($OUTPUTFILE);
-
-open (OUTFILE, ">$OUTPUTFILE");
-print OUTFILE genheader();
 print OUTFILE "
 	echo 'Subscription set $set created';
 	echo 'Adding tables to the subscription set';
@@ -85,12 +73,6 @@
   $TABLE_ID++;
 }
 
-close OUTFILE;
-run_slonik_script($OUTPUTFILE);
-
-open (OUTFILE, ">$OUTPUTFILE");
-print OUTFILE genheader();
-# Finish subscription set...
 print OUTFILE "
                 echo 'Adding sequences to the subscription set';
 ";
Index: init_cluster.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/init_cluster.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/init_cluster.pl -Ltools/altperl/init_cluster.pl -u -w -r1.5 -r1.6
--- tools/altperl/init_cluster.pl
+++ tools/altperl/init_cluster.pl
@@ -16,11 +16,6 @@
 print SLONIK "
    init cluster (id = $MASTERNODE, comment = 'Node $node - $dbname\@$dbhost');
 ";
-close SLONIK;
-run_slonik_script($FILE);
-
-open(SLONIK, ">$FILE");
-print SLONIK genheader();
 
 foreach my $node (@NODES) {
   if ($node != $MASTERNODE) {		# skip the first one; it's already initialized!
@@ -31,11 +26,6 @@
 
 print SLONIK "echo 'Set up replication nodes';
 ";
-close SLONIK;
-run_slonik_script($FILE);
-
-open(SLONIK, ">$FILE");
-print SLONIK genheader();
 
 my @VIA ;
 generate_listen_paths();
@@ -63,12 +53,6 @@
   }
 }
 
-close SLONIK;
-
-run_slonik_script($FILE);
-
-open(SLONIK, ">$FILE");
-print SLONIK genheader();
 
 foreach my $origin (@NODES) {
   my $dsna = $DSN[$origin];