From cae6d5f26a53d793feeb14f5b6323a623a8250d2 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 10 Jan 2012 09:38:24 +0000 Subject: use yaml conf for graph generation scripts --- bin/problem-creation-graph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/problem-creation-graph') diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph index 6d34d3b49..95ed7bca8 100755 --- a/bin/problem-creation-graph +++ b/bin/problem-creation-graph @@ -18,7 +18,7 @@ cd `dirname $0` cd ../../ source fixmystreet/commonlib/shlib/deployfns -read_conf fixmystreet/conf/general +read_conf fixmystreet/conf/general.yml if [ $OPTION_BASE_URL = "http://reportemptyhomes.com" ]; then DATE="2008-10-01" -- cgit v1.2.3 From b913597550b962db73715709dcd6fa1b274eb625 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 10 Jan 2012 09:42:21 +0000 Subject: BCI -> FMS conf change for graph generation scripts --- bin/problem-creation-graph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/problem-creation-graph') diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph index 95ed7bca8..0c41581e8 100755 --- a/bin/problem-creation-graph +++ b/bin/problem-creation-graph @@ -42,7 +42,7 @@ function grab_data { $1 group by date(created) order by date(created) - ;" | psql --host $OPTION_BCI_DB_HOST --port $OPTION_BCI_DB_PORT -A -F " " $OPTION_BCI_DB_NAME $OPTION_BCI_DB_USER | egrep -v "date|rows" >$2 + ;" | psql --host $FMS_DB_HOST --port $FMS_DB_PORT -A -F " " $FMS_DB_NAME $FMS_DB_USER | egrep -v "date|rows" >$2 } # rather nastily, work out the cumulative heights in reverse, so can plot impulses on top of each other -- cgit v1.2.3 From 7420afcd206a0e1454ce454078d8a76849207ec0 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 10 Jan 2012 09:55:57 +0000 Subject: BCI -> FMS --- bin/problem-creation-graph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/problem-creation-graph') diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph index 0c41581e8..2728704e7 100755 --- a/bin/problem-creation-graph +++ b/bin/problem-creation-graph @@ -20,7 +20,7 @@ source fixmystreet/commonlib/shlib/deployfns read_conf fixmystreet/conf/general.yml -if [ $OPTION_BASE_URL = "http://reportemptyhomes.com" ]; then +if [ $BASE_URL = "http://reportemptyhomes.com" ]; then DATE="2008-10-01" else DATE="2007-02-01" -- cgit v1.2.3 From 62f0d7ea89e8eda7c74d1467187a2ceddf8dd7d5 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 10 Jan 2012 11:25:10 +0000 Subject: the yaml2sh call in deployfns adds OPTION_ on the front of config key names and is used elsewhere so add OPTION_ back on --- bin/problem-creation-graph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/problem-creation-graph') diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph index 2728704e7..4bba1cdb8 100755 --- a/bin/problem-creation-graph +++ b/bin/problem-creation-graph @@ -20,7 +20,7 @@ source fixmystreet/commonlib/shlib/deployfns read_conf fixmystreet/conf/general.yml -if [ $BASE_URL = "http://reportemptyhomes.com" ]; then +if [ $OPTION_BASE_URL = "http://reportemptyhomes.com" ]; then DATE="2008-10-01" else DATE="2007-02-01" @@ -42,7 +42,7 @@ function grab_data { $1 group by date(created) order by date(created) - ;" | psql --host $FMS_DB_HOST --port $FMS_DB_PORT -A -F " " $FMS_DB_NAME $FMS_DB_USER | egrep -v "date|rows" >$2 + ;" | psql --host $OPTION_FMS_DB_HOST --port $OPTION_FMS_DB_PORT -A -F " " $OPTION_FMS_DB_NAME $OPTION_FMS_DB_USER | egrep -v "date|rows" >$2 } # rather nastily, work out the cumulative heights in reverse, so can plot impulses on top of each other -- cgit v1.2.3