diff --git a/roles/web-data-analysis/files/condense-hotspot.sh b/roles/web-data-analysis/files/condense-hotspot.sh index 95784984d9..1f5976c4b9 100644 --- a/roles/web-data-analysis/files/condense-hotspot.sh +++ b/roles/web-data-analysis/files/condense-hotspot.sh @@ -77,7 +77,7 @@ fi find ${WORKDIR} -type f | grep raw- | xargs cat | sort -u | awk 'BEGIN{x=0; y=0}; {if (x != $1){ print x,y; x=$1; y=$2} else {y=y+$2}}' > ${WORKDIR}/worked-all -awk -f ${LSHARE}/${PROJECT}-data.awk ${WORKDIR}/worked-all | sort -u > ${WEBDIR}/${PROJECT}data-all.csv +awk -f ${LSHARE}/${PROJECT}-data.awk ${WORKDIR}/worked-all | grep -v "1970-01-01,0,0,0" | sort -u > ${WEBDIR}/${PROJECT}data-all.csv # Make the seven day moving average file /usr/local/bin/hotspot-moving_avg.py > ${WEBDIR}/${PROJECT}data-all-7day-ma.csv diff --git a/roles/web-data-analysis/files/hotspot-data.awk b/roles/web-data-analysis/files/hotspot-data.awk index 3e9a029477..93ec3d3d46 100644 --- a/roles/web-data-analysis/files/hotspot-data.awk +++ b/roles/web-data-analysis/files/hotspot-data.awk @@ -1,5 +1,5 @@ BEGIN{ - date=strftime("%F",172800); + date=strftime("%F",86401); count=1; sum=0; most=0;