# HG changeset patch # User Henry S. Thompson # Date 1696269250 -3600 # Node ID 0326805aa6df52812d797179320eb731fabc34d2 # Parent 14d3802112b2c11c703bfcc54e7796a235d417be change path to merge_date.py diff -r 14d3802112b2 -r 0326805aa6df bin/do_idx.sh --- a/bin/do_idx.sh Mon Oct 02 18:52:43 2023 +0100 +++ b/bin/do_idx.sh Mon Oct 02 18:54:10 2023 +0100 @@ -1,14 +1,21 @@ #!/bin/bash +# Usage: do_idx.sh [-d...] [-m previously-merged-log] result-dir cdx-source-dir while [ "$1" = "-d" ] do shift debug="$debug -d" done +if [ "$1" = "-m" ] +then + shift + merged="-m $1" + shift +fi export res="$1" orig="$2" # igzip was faster, but produced bigger files, so went to gzip one step # smaller than default (-6), which produces slightly _smaller_ blocks. -merge_date.py $debug <(LC_ALL=C sort -m -k1,3 -s $res/ks_[0-9]*.tsv) \ +~/lib/python/cc/lmh/merge_date.py $debug $merged <(LC_ALL=C sort -m -k1,3 -s $res/ks_[0-9]*.tsv) \ $orig $res/idx 2>$res/merge.log | \ parallel -j 10 'echo {#} {} >$res/merge_{#}.log echo $(date) {#} {}