Update of /home/cvsd/slony1/slony1-engine/tests/testlogship
In directory main.slony.info:/tmp/cvs-serv5927/testlogship

Modified Files:
      Tag: REL_1_2_STABLE
	generate_dml.sh 
Log Message:
Update log shipping test to search for log files in the fashion now
supported by the new file naming convention.


Index: generate_dml.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testlogship/generate_dml.sh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** generate_dml.sh	20 Aug 2007 22:33:42 -0000	1.1.2.5
--- generate_dml.sh	27 Aug 2007 15:40:45 -0000	1.1.2.6
***************
*** 133,139 ****
  
    status "final data load complete - now load files into log shipped node"
!   for logfile in `/usr/bin/find ${mktmp}/archive_logs_2 -name "slony1_log_*.sql" -type f | sort`; do
!     $pgbindir/psql -h ${HOST3} -p ${PORT3} -d ${DB3} -U ${USER3} -f ${logfile} >> $mktmp/logshipping_output.log 2>> $mktmp/logshipping_errors.log
!     status "load file ${logfile} - ${?}"
    done
    status "done"
--- 133,154 ----
  
    status "final data load complete - now load files into log shipped node"
!   firstseq=`(cd ${mktmp}/archive_logs_2; /usr/bin/find -name "*.sql") | cut -d "_" -f 4 | cut -d "." -f 1 | sort -n | head -1`
!   lastseq=`(cd ${mktmp}/archive_logs_2; /usr/bin/find -name "*.sql") | cut -d "_" -f 4 | cut -d "." -f 1 | sort -n | tail -1`
!   status "Logs numbered from ${firstseq} to ${lastseq}"
!   currseq=${firstseq}
!   while : ; do
! #      00000000000000000000
! #      12345678901234567890
!     cs=`printf "%020d" ${currseq}`
!     status "current sequence value: ${cs}"
!     for logfile in `/usr/bin/find ${mktmp}/archive_logs_2 -name "slony1_log_*_${cs}.sql" -type f`; do
!       $pgbindir/psql -h ${HOST3} -p ${PORT3} -d ${DB3} -U ${USER3} -f ${logfile} >> $mktmp/logshipping_output.log 2>> $mktmp/logshipping_errors.log
!       status "load file ${logfile} - ${?}"
!     done
!     if [ ${currseq} -gt ${lastseq} ]; then
!       break;
!     else
!       currseq=`expr ${currseq} + 1`
!     fi
    done
    status "done"