diff options
| author | Michał Klichowicz <emkael@tlen.pl> | 2019-11-09 12:24:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-09 12:24:01 +0100 |
| commit | ee6a00f4af64ad679d67233e730a5fa0d308ce4b (patch) | |
| tree | 44e8ed0e0a7f03e83a7a0bbf2c65bccdce76de77 /bin | |
| parent | 7c1d49570f36bd334fd0a11f87a3d200bf5480df (diff) | |
| parent | 3d772272a7bf0d582eeaa527197a08545e3399ae (diff) | |
Merge pull request #17 from emkael/baza2.csv
Baza2.csv
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cezar-db-fetch.sh | 2 | ||||
| -rwxr-xr-x | bin/rankings-csv-import.sh | 2 | ||||
| -rwxr-xr-x | bin/rankings-tables-build.sh | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/cezar-db-fetch.sh b/bin/cezar-db-fetch.sh index 3af7357..cfbc8ab 100755 --- a/bin/cezar-db-fetch.sh +++ b/bin/cezar-db-fetch.sh @@ -3,7 +3,7 @@ PAGEDIR=`dirname $0` DATE=`date --date='yesterday' +%Y%m%d` OUTPUTFILE=`realpath $PAGEDIR/../data/cezar/$DATE.csv` TMPFILE=$PAGEDIR/temp -wget http://msc.com.pl/cezar/download/baza.csv -q -O - | iconv -f windows-1250 -t utf-8 > $TMPFILE +wget http://msc.com.pl/cezar/download/baza2.csv -q -O $TMPFILE if [ -s $TMPFILE ]; then tail -n +2 $TMPFILE | sort > $OUTPUTFILE echo "Downloaded Cezar CSV into $OUTPUTFILE" diff --git a/bin/rankings-csv-import.sh b/bin/rankings-csv-import.sh index 54ce6bc..9eddd82 100755 --- a/bin/rankings-csv-import.sh +++ b/bin/rankings-csv-import.sh @@ -7,7 +7,7 @@ REPLACE INTO TABLE temp_rankings FIELDS TERMINATED BY ','; INSERT INTO rankings ( - SELECT pid, \`date\`, place, score, region, flags, rank, club, 0 + SELECT pid, \`date\`, place, score, region, gender, flags, rank, club, 0 FROM temp_rankings JOIN players ON players.id = temp_rankings.pid diff --git a/bin/rankings-tables-build.sh b/bin/rankings-tables-build.sh index 0d85972..d3806a7 100755 --- a/bin/rankings-tables-build.sh +++ b/bin/rankings-tables-build.sh @@ -2,9 +2,9 @@ CONFIG=$1 DIR=$2 cat $CONFIG | - jq '.[] | .date, .url, .index, .name' | - xargs -n4 | - while read DATE URL INDEX NAME + jq '.[] | .date, .url, .index, .menu_age // "old", .name' | + xargs -n5 | + while read DATE URL INDEX AGEMENU NAME do - python scripts/rankings-tables-compile.py "$NAME" $INDEX $DIR/.menu.html $DATE > $DIR/$URL + python scripts/rankings-tables-compile.py "$NAME" $INDEX $DIR/.menu.html $DATE "$AGEMENU" > $DIR/$URL done |