From: Siraaj Khandkar Date: Tue, 17 Mar 2020 23:22:46 +0000 (-0400) Subject: Support dumping out all the NY data X-Git-Url: https://git.xandkar.net/?p=covid-19-scrapers.git;a=commitdiff_plain;h=a8677ce2ff31aed05e1adf8bc142b459f662b52a Support dumping out all the NY data --- diff --git a/fetch-case-count-usa-ny b/fetch-case-count-usa-ny index e346935..16cf859 100755 --- a/fetch-case-count-usa-ny +++ b/fetch-case-count-usa-ny @@ -34,7 +34,6 @@ VALID_LOCATIONS=' Montgomery Nassau New York City - New York State (Outside of NYC) Onondaga Ontario Orange @@ -47,15 +46,15 @@ VALID_LOCATIONS=' Sullivan Tioga Tompkins - Total Positive Cases (Statewide) Ulster Westchester Wyoming ' usage() { - printf "Usage: %s [LOCATION]\n" "$0" + printf "Usage: %s [OPTION | LOCATION]\n" "$0" printf '\n' + printf 'OPTION = -h | --all \n' printf 'LOCATION =' printf '%s\n' "$VALID_LOCATIONS" printf "Default LOCATION:\n %s\n" "$DEFAULT_LOCATION" @@ -64,15 +63,17 @@ usage() { case "$1" in '-h') usage;; - '' ) location="$DEFAULT_LOCATION";; - * ) location="$1";; + '--all') opt_all=1;; + '' ) target_location="$DEFAULT_LOCATION";; + * ) target_location="$1";; esac curl "$URI" \ | hxpipe \ | awk \ - -v location="$location" \ + -v target_location="$target_location" \ -v target_path="$TARGET_PATH" \ + -v opt_all="$opt_all" \ ' /^[\(\)]/ { update_node() @@ -88,17 +89,26 @@ curl "$URI" \ XmlPayload = substr($0, 2, length($0)) } - XmlPath == target_path && XmlPayload == location { - found = 1; + XmlPath == target_path && !location { + location = XmlPayload; next } - XmlPath == target_path && found { - print XmlPayload; - found = 0; + XmlPath == target_path && location { + case_counts[location] = XmlPayload; + location = ""; next; } + END { + if (opt_all) { + for (location in case_counts) + printf("%d|%s\n", case_counts[location], location) + } else { + printf("%d\n", case_counts[target_location]) + } + } + function path_to_string(path, depth, p, i) { p = "" for (i = 1; i <= depth; i++) { @@ -142,4 +152,6 @@ curl "$URI" \ sub("^" $1 s $2 s, "", val) _hxpipe_curr_attrs[key] = val } - ' + ' \ +| column -ts\| \ +| sort -n -k 1