Merge pull request #20 from makoshark/master

[covid19.git] / cron-wikipedia_views.sh

diff --git a/cron-wikipedia_views.sh b/cron-wikipedia_views.sh
old mode 100644 (file)
new mode 100755 (executable)
index ec3d4ec..bb2f621
--- a/cron-wikipedia_views.sh
+++ b/cron-wikipedia_views.sh
@@ -1,16 +1,19 @@
 #!/bin/bash -x
 
 #!/bin/bash -x
 

+WORKING_DIR="/home/SOC.NORTHWESTERN.EDU/bmh1867/covid19"
+cd $WORKING_DIR
+

 TZ="UTC"
 TZ="UTC"

-date_string=$(date +%Y%m%d)
+date_string=${OVERRIDE_DATE_STRING:-$(date +%Y%m%d)}

 
 

-./wikipedia/scripts/wikiproject_scraper.py 2> >(tee wikipedia/logs/enwp-wikiproject_scraper-${date_string}.log)
+view_log="enwp-daily_views-${date_string}.log"
+./wikipedia/scripts/wikiproject_scraper.py 2> >(tee wikipedia/logs/${view_log})

 
 # get the list of files
 
 # get the list of files

-view_log="enwp-daily_views-${date_string}.log"
-./wikipedia/scripts/fetch_enwiki_daily_views.py 2> >(tee wikipedia/logs/${view_log})
-cp wikipedia/logs/${view_log} /var/www/covid19/wikipedia/logs/${view_log}
-cp wikipedia/data/digobs_covid19-wikipedia-enwiki_dailyviews-${date_string}.tsv /var/www/covid19/wikipedia/
+./wikipedia/scripts/fetch_enwiki_daily_views.py -d "${date_string}" 2> >(tee -a wikipedia/logs/${view_log})
+mv wikipedia/logs/${view_log} /var/www/covid19/wikipedia/logs/${view_log}
+mv wikipedia/data/digobs_covid19-wikipedia-enwiki_dailyviews-${date_string}.tsv /var/www/covid19/wikipedia/

 
 # xz wikipedia/data/digobs_covid19-wikipedia-enwiki_dailyviews-${date_string}.json
 
 # xz wikipedia/data/digobs_covid19-wikipedia-enwiki_dailyviews-${date_string}.json

-cp wikipedia/data/digobs_covid19-wikipedia-enwiki_dailyviews-${date_string}.json /var/www/covid19/wikipedia/
+mv wikipedia/data/digobs_covid19-wikipedia-enwiki_dailyviews-${date_string}.json /var/www/covid19/wikipedia/