Preliminary final merging.
This commit is contained in:
parent
1d0ab4e2d3
commit
7093dff61a
1 changed files with 30 additions and 9 deletions
|
@ -310,7 +310,6 @@ merge_acc() {
|
||||||
grep -A 100000 '^ID' "$BANK_DIR_PARTS/$part" \
|
grep -A 100000 '^ID' "$BANK_DIR_PARTS/$part" \
|
||||||
| grep -v '^ID'
|
| grep -v '^ID'
|
||||||
done
|
done
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -339,6 +338,20 @@ last_acc_year_part() {
|
||||||
| head -n 1
|
| head -n 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Returns all parts except for the first
|
||||||
|
# $1 - account number
|
||||||
|
# $2 - year
|
||||||
|
all_but_first_year_parts() {
|
||||||
|
accno="$1"
|
||||||
|
first="`first_acc_year_part $1 $2`"
|
||||||
|
ls "${BANK_DIR_PARTS}/" \
|
||||||
|
| grep "^$accno" \
|
||||||
|
| grep "$2-[0-9][0-9].csv$" \
|
||||||
|
| sort \
|
||||||
|
| grep -v "$first"
|
||||||
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Dynamic part
|
# Dynamic part
|
||||||
# $1 - account number
|
# $1 - account number
|
||||||
|
@ -363,7 +376,11 @@ make_acc_year_header() {
|
||||||
# $2 - year
|
# $2 - year
|
||||||
merge_acc_year() {
|
merge_acc_year() {
|
||||||
make_acc_year_header "$1" "$2"
|
make_acc_year_header "$1" "$2"
|
||||||
echo "TODO"
|
grep -A 100000 '^$' "$BANK_DIR_PARTS/`first_acc_year_part $1 $2`"
|
||||||
|
for part in `all_but_first_year_parts $1 $2` ; do
|
||||||
|
grep -A 100000 '^ID' "$BANK_DIR_PARTS/$part" \
|
||||||
|
| grep -v '^ID'
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Current year and month
|
# Current year and month
|
||||||
|
@ -430,15 +447,19 @@ while read accnt ; do
|
||||||
# Merge the account
|
# Merge the account
|
||||||
for year in `seq $currentyear $CYEAR` ; do
|
for year in `seq $currentyear $CYEAR` ; do
|
||||||
log "Merging $ACCNO $year"
|
log "Merging $ACCNO $year"
|
||||||
merge_acc_year "$ACCNO" "$year" >"$BANK_DIR/$ACCNO-$year.csv"
|
merge_acc_year "$ACCNO" "$year" >"$BANK_DIR_PARTS/$ACCNO-$year.csv.tmp"
|
||||||
|
if [ -r "$BANK_DIR_PARTS/$ACCNO-$year.csv" ] ; then
|
||||||
|
cp "$BANK_DIR_PARTS/$ACCNO-$year.csv" "$BANK_DIR_PARTS/$ACCNO-$year.csv.old"
|
||||||
|
fi
|
||||||
|
mv "$BANK_DIR_PARTS/$ACCNO-$year.csv.tmp" "$BANK_DIR_PARTS/$ACCNO-$year.csv"
|
||||||
done
|
done
|
||||||
log "FINAL Merging $ACCNO"
|
log "FINAL Merging $ACCNO"
|
||||||
#;merge_acc "$ACCNO" >"$BANK_DIR/$ACCNO.csv.tmp"
|
merge_acc "$ACCNO" >"$BANK_DIR/$ACCNO.csv.tmp"
|
||||||
log "Renaming $ACCNO"
|
log "Renaming $ACCNO"
|
||||||
#if [ -r "$BANK_DIR/$ACCNO.csv" ] ; then
|
if [ -r "$BANK_DIR/$ACCNO.csv" ] ; then
|
||||||
#cp "$BANK_DIR/$ACCNO.csv" "$BANK_DIR/$ACCNO.csv.old"
|
cp "$BANK_DIR/$ACCNO.csv" "$BANK_DIR/$ACCNO.csv.old"
|
||||||
#fi
|
fi
|
||||||
#mv "$BANK_DIR/$ACCNO.csv.tmp" "$BANK_DIR/$ACCNO.csv"
|
mv "$BANK_DIR/$ACCNO.csv.tmp" "$BANK_DIR/$ACCNO.csv"
|
||||||
done < "$APIKEYS_FILE"
|
done < "$APIKEYS_FILE"
|
||||||
|
|
||||||
# Mark
|
# Mark
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue