From aacf4dd3103179ce94797a4aa6cd5cedd8369223 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Wed, 7 Sep 2016 16:04:44 +0000
Subject: [PATCH] forgot I had 2 print statements which needed to be aligned.
 Removed extraneous data in script.

---
 roles/web-data-analysis/files/condense-getfedoralogs.sh | 4 ++--
 roles/web-data-analysis/files/getfedora-data.awk        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/web-data-analysis/files/condense-getfedoralogs.sh b/roles/web-data-analysis/files/condense-getfedoralogs.sh
index 99129b042d..5d5dfcb230 100644
--- a/roles/web-data-analysis/files/condense-getfedoralogs.sh
+++ b/roles/web-data-analysis/files/condense-getfedoralogs.sh
@@ -81,13 +81,13 @@ sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 8G -u ${WORKDIR}/${YEAR}/out-
 sort -o ${WORKDIR}/out-${YEAR} -S 8G -u ${WORKDIR}/out-${YEAR} ${WORKFILE}
 
 # Because the logs stop at 04:00 we can only get 24 hours from 6 days before. 
-egrep "${OLDDATE}" ${WORKDIR}/out-${OLDYEAR} > ${TEMPDIR}/watched-day
+grep "${OLDDATE}" ${WORKDIR}/out-${OLDYEAR} > ${TEMPDIR}/watched-day
 
 # Grab the data and put it in the two files. This makes it a lot
 # faster to process as a whole year may take an hour to go through.
 
 for i in ${OLDYEAR} all; do
-    awk -f ${LSHARE}/${PROJECT}-data.awk ${TEMPDIR}/watched-day >> ${WEBDIR}/${PROJECT}data-${i}.csv
+    awk -f ${LSHARE}/${PROJECT}-data.awk ${TEMPDIR}/watched-day | grep "${OLDDATE}" >> ${WEBDIR}/${PROJECT}data-${i}.csv
 done
 
 gnuplot ${LSHARE}/${PROJECT}-data.gp
diff --git a/roles/web-data-analysis/files/getfedora-data.awk b/roles/web-data-analysis/files/getfedora-data.awk
index 7dd1a5e97e..e55ec4c816 100644
--- a/roles/web-data-analysis/files/getfedora-data.awk
+++ b/roles/web-data-analysis/files/getfedora-data.awk
@@ -167,6 +167,6 @@ BEGIN{
 }
 
 END {
-    print olddate "," total "," edit "," atomic "," cloud "," server "," workstation "," unk_edt "," f20 "," f21 "," f22 "," f23 "," f24 "," unk_rel "," arm_32 "," arm_64 "," ppc_le "," ppc_he "," s390x "," x86_32 "," x86_64 "," unk_arc "," netinstall "," netserv "," network "," netclod "," spin "," xfce "," soas "," lxde ","  secu "," robo "," mate "," scik "," jamk "," desi "," elec "," game "," mini "," cinn "," kde
+	    print olddate "," total "," edit "," atomic "," cloud "," server "," workstation "," unk_edt "," f20 "," f21 "," f22 "," f23 "," f24 "," f25 "," f26 "," f27 "," f28 "," f29 "," unk_rel "," arm_32 "," arm_64 "," ppc_le "," ppc_he "," s390x "," x86_32 "," x86_64 "," unk_arc "," netinstall "," netserv "," network "," netclod "," spin "," xfce "," soas "," lxde ","  secu "," robo "," mate "," scik "," jamk "," desi "," elec "," game "," mini "," cinn "," kde;
 }