BCI -> FMS

10 files changed, 39 insertions, 39 deletions

diff --git a/bin/export-norwegian-contacts b/bin/export-norwegian-contacts
index 8a7d438e5..0209c6512 100644
--- a/bin/export-norwegian-contacts
+++ b/bin/export-norwegian-contacts
@@ -31,11 +31,11 @@ use mySociety::MaPit;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 }
 
diff --git a/bin/import-categories b/bin/import-categories
index add12d3d0..e9008b93f 100755
--- a/bin/import-categories
+++ b/bin/import-categories
@@ -24,11 +24,11 @@ use mySociety::VotingArea;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 }
 
diff --git a/bin/load-contacts b/bin/load-contacts
index 0fa76ca11..b18699db1 100755
--- a/bin/load-contacts
+++ b/bin/load-contacts
@@ -23,11 +23,11 @@ use mySociety::Random;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 
     if (!dbh()->selectrow_array('select secret from secret for update of secret')) {
diff --git a/bin/load-norwegian-contacts b/bin/load-norwegian-contacts
index f7466ad2a..b73778848 100755
--- a/bin/load-norwegian-contacts
+++ b/bin/load-norwegian-contacts
@@ -25,11 +25,11 @@ use mySociety::Random;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 
     if (!dbh()->selectrow_array('select secret from secret for update of secret')) {
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"
diff --git a/bin/rotate-photos b/bin/rotate-photos
index 84c713926..faf2748e6 100755
--- a/bin/rotate-photos
+++ b/bin/rotate-photos
@@ -24,11 +24,11 @@ use mySociety::TempFiles;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 }
 
diff --git a/bin/showcouncilrates b/bin/showcouncilrates
index 9ae5c3e7b..cc8ce8d10 100755
--- a/bin/showcouncilrates
+++ b/bin/showcouncilrates
@@ -16,11 +16,11 @@ use FixMyStreet::Geocode::OSM;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 }
 
diff --git a/bin/test-mailin b/bin/test-mailin
index 96e2022c0..3f101b438 100755
--- a/bin/test-mailin
+++ b/bin/test-mailin
@@ -29,7 +29,7 @@ use mySociety::WebTestHarness;
 
 print_log('notice', "started");
 our $wth = new mySociety::WebTestHarness();
-$wth->database_connect('BCI_');
+$wth->database_connect('FMS_');
 print_log('notice', "reading mail from STDIN");
 my $slurped = read_file(\*STDIN);
 print_log('notice', "calling email_incoming");
diff --git a/bin/test-run b/bin/test-run
index 58cf0b2ea..29e975ce4 100755
--- a/bin/test-run
+++ b/bin/test-run
@@ -5,7 +5,7 @@
 # 
 # Requires:
 # * ../conf/general file set up for FixMyStreet, and matching the below requirements
-# * apache configured to serve ../web on OPTION_BASE_URL
+# * apache configured to serve ../web on BASE_URL
 # * a database with name ending "_testharness"; this script will drop and remake the
 #   database, so make sure it is never used for anything important
 # * email addresses (email_n below) configured to pipe to ./test-mailin with fast
@@ -54,7 +54,7 @@ date_print("Set up web test harness...");
 my ($wth, $action, $verbose, $pause, $multispawn) = mySociety::WebTestHarness::setup({
     actions => \@actions,
     actions_desc => \%actions_desc,
-    dbname => 'BCI',
+    dbname => 'FMS',
     'sql_extra' => ['../db/alert_types.sql'],
 });
 $multispawn = 1;
diff --git a/bin/update-areas b/bin/update-areas
index bbc933faf..a8cc01769 100755
--- a/bin/update-areas
+++ b/bin/update-areas
@@ -24,11 +24,11 @@ use mySociety::VotingArea;
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
     mySociety::DBHandle::configure(
-        Name => mySociety::Config::get('BCI_DB_NAME'),
-        User => mySociety::Config::get('BCI_DB_USER'),
-        Password => mySociety::Config::get('BCI_DB_PASS'),
-        Host => mySociety::Config::get('BCI_DB_HOST', undef),
-        Port => mySociety::Config::get('BCI_DB_PORT', undef)
+        Name => mySociety::Config::get('FMS_DB_NAME'),
+        User => mySociety::Config::get('FMS_DB_USER'),
+        Password => mySociety::Config::get('FMS_DB_PASS'),
+        Host => mySociety::Config::get('FMS_DB_HOST', undef),
+        Port => mySociety::Config::get('FMS_DB_PORT', undef)
     );
 }