diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-01-10 11:25:10 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-01-10 11:25:10 +0000 |
| commit | 62f0d7ea89e8eda7c74d1467187a2ceddf8dd7d5 (patch) | |
| tree | 7bda44250fafae1cecb3c7fca02c3ae95163b979 | |
| parent | 7420afcd206a0e1454ce454078d8a76849207ec0 (diff) | |
the yaml2sh call in deployfns adds OPTION_ on the front of config key names and is used elsewhere so add OPTION_ back on
| -rwxr-xr-x | bin/problem-creation-graph | 4 | ||||
| -rwxr-xr-x | bin/problems-filed-graph | 2 |
2 files changed, 3 insertions, 3 deletions
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 diff --git a/bin/problems-filed-graph b/bin/problems-filed-graph index a2282afdb..dbac35639 100755 --- a/bin/problems-filed-graph +++ b/bin/problems-filed-graph @@ -29,7 +29,7 @@ echo "select where state not in ('unconfirmed', 'hidden') 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" >$SOURCEO + ;" | 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" >$SOURCEO #echo "source $SOURCEO" cat >$GPSCRIPT <<END |