# HG changeset patch
# User Henry S. Thompson <ht@markup.co.uk>
# Date 1542652281 0
# Node ID 2bde174fe9e2b6acdc248247f89637952d31fac6
# Parent  db75ec542c668f6b4d623c2bef6a040284a04de0
as used for mergedWhich.x64700

diff -r db75ec542c66 -r 2bde174fe9e2 workers/bin/_fixAndMerge.sh
--- a/workers/bin/_fixAndMerge.sh	Sat Nov 10 13:22:21 2018 +0000
+++ b/workers/bin/_fixAndMerge.sh	Mon Nov 19 18:31:21 2018 +0000
@@ -8,8 +8,10 @@
 sleep $pause
 echo \#.$id $(date) starting >> $log
 cat > /var/data/in$id
-echo \#.$id $(date) got list >> $log
-until ( rm /var/data/d$id ; xargs -n 100 ssh $home "xargs gzip -c" < /var/data/in$id | gunzip -c >> /var/data/d$id ) do echo retrying 1>&2; sleep $pause; done
+echo \#.$id $(date) got list $(wc -l /var/data/in$id) >> $log
+rm -f /var/data/d$id
+xargs -n 100 _doFetch.sh "$@" < /var/data/in$id >/var/data/d$id
+echo \#.$id $(wc -l /var/data/d$id)
 echo \#.$id $(date) got data >> $log
 fixDates.py < /var/data/d$id
 echo \#.$id $(date) done >> $log