Permalink
Browse files

Update library paths

  • Loading branch information...
1 parent f511081 commit 461700fb1420376569d4be89b0b1779a7046c5e0 @crowbot crowbot committed Jan 19, 2010
View
@@ -15,9 +15,9 @@
require_once "../conf/general";
require_once "../phplib/queue.php";
-require_once "../../phplib/dadem.php";
-require_once "../../phplib/votingarea.php";
-require_once "../../phplib/utility.php";
+require_once "../commonlib/phplib/dadem.php";
+require_once "../commonlib/phplib/votingarea.php";
+require_once "../commonlib/phplib/utility.php";
function error($str) {
fwrite(STDERR, "admin_reminder_mail: ERROR: $str\n");
@@ -31,7 +31,7 @@ function verbose($str) {
$short_opts = '';
$long_opts = array('help', 'verbose');
-require_once '../../phplib/phpcli.php';
+require_once '../commonlib/phplib/phpcli.php';
$switches = $options[0];
$args = $options[1];
View
@@ -14,12 +14,12 @@
*/
require_once "../conf/general";
-require_once "../../phplib/survey.php";
-require_once "../../phplib/auth.php";
+require_once "../commonlib/phplib/survey.php";
+require_once "../commonlib/phplib/auth.php";
$short_opts = '';
$long_opts = array();
-require_once '../../phplib/phpcli.php';
+require_once '../commonlib/phplib/phpcli.php';
if (count($args) != 2) {
print "Specify email as only argument\n";
View
@@ -16,7 +16,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use CGI;
use DateTime;
View
@@ -6,7 +6,7 @@ use Statistics::Distributions qw(fdistr);
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Sundries;
View
@@ -21,7 +21,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Data::Dumper;
use Text::Aspell;
View
@@ -17,7 +17,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use CGI;
use DateTime;
View
@@ -20,7 +20,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use File::Slurp;
use mySociety::Config;
@@ -18,7 +18,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Data::Dumper;
use POSIX qw(strftime);
View
@@ -17,7 +17,7 @@ my $low = 10000;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Data::Dumper;
use POSIX qw(strftime);
View
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../../perllib -I../perllib
+#!/usr/bin/perl -w -I../commonlib/perllib -I../perllib
#
# fyrqd:
# FYR queue daemon.
@@ -15,7 +15,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Error qw(:try);
use Fcntl;
View
@@ -19,7 +19,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use MIME::Entity;
use POSIX qw(strftime);
View
@@ -16,7 +16,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use mySociety::Config;
View
@@ -15,9 +15,9 @@ EXTENSION=".png"
cd `dirname $0`
cd ../../
-source shlib/deployfns
+source writeotthem/commonlib/shlib/deployfns
-read_conf fyr/conf/general
+read_conf writetothem/conf/general
SOURCEO=/tmp/fyr-fax-rate-graph-data-$RANDOM$RANDOM
GPSCRIPT=/tmp/fyr-fax-rate-graph-script-$RANDOM$RANDOM
@@ -54,5 +54,5 @@ END
#echo "gpscript $GPSCRIPT"
export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera
-gnuplot < $GPSCRIPT > fyr/web/fyr-live-faxes$EXTENSION
+gnuplot < $GPSCRIPT > writetothem/web/fyr-live-faxes$EXTENSION
View
@@ -16,9 +16,8 @@ EXTENSION=".png"
cd `dirname $0`
cd ../../
-source shlib/deployfns
-
-read_conf fyr/conf/general
+source writeotthem/commonlib/shlib/deployfns
+read_conf writetothem/conf/general
SOURCEO=/tmp/fyr-signup-rate-graph-data-nonwmc-$RANDOM$RANDOM
SOURCED=/tmp/fyr-signup-rate-graph-data-dispatched-$RANDOM$RANDOM
@@ -87,5 +86,5 @@ END
#echo "gpscript $GPSCRIPT"
export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera
-gnuplot < $GPSCRIPT > fyr/web/fyr-live-signups$EXTENSION
+gnuplot < $GPSCRIPT > writetothem/web/fyr-live-signups$EXTENSION
View
@@ -16,7 +16,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Text::CSV_XS;
use DateTime;
View
@@ -29,7 +29,7 @@ my $low = 1000;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Data::Dumper;
use POSIX qw(strftime);
View
@@ -11,10 +11,10 @@
*
*/
-require_once '../../phplib/cli.php';
+require_once '../commonlib/phplib/cli.php';
require_once '../conf/general';
-require_once '../../phplib/utility.php';
-require_once '../../phplib/dadem.php';
+require_once '../commonlib/phplib/utility.php';
+require_once '../commonlib/phplib/dadem.php';
require_once '../phplib/questionnaire_report_2005_WMC.php';
$data = array();
View
@@ -8,7 +8,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use utf8;
binmode(STDOUT, ':utf8');
@@ -31,7 +31,7 @@ $_ = join('', <FP>);
close FP;
print '<?php
-/* Automatically generated by fyr/bin/stats-redo-fymp */
+/* Automatically generated by writetothem/bin/stats-redo-fymp */
$questionnaire_report_FYMP_WMC = array(
';
View
@@ -16,20 +16,20 @@ EXTENSION=".svg"
cd `dirname $0`
cd ../../
-source shlib/deployfns
+source writeotthem/commonlib/shlib/deployfns
-read_conf fyr/conf/general
+read_conf writetothem/conf/general
SOURCED=/tmp/fyr-signup-rate-graph-data-dispatched-$RANDOM$RANDOM
SOURCEE=/tmp/fyr-signup-rate-graph-data-dispatched-$RANDOM$RANDOM
SOURCEF=/tmp/fyr-signup-rate-graph-data-dispatched-$RANDOM$RANDOM
SOURCEG=/tmp/fyr-signup-rate-graph-data-dispatched-$RANDOM$RANDOM
GPSCRIPT=/tmp/fyr-signup-rate-graph-script-$RANDOM$RANDOM
-fyr/bin/stats-response-histo-out 2005 >$SOURCED
-fyr/bin/stats-response-histo-out 2006 >$SOURCEE
-fyr/bin/stats-response-histo-out 2007 >$SOURCEF
-fyr/bin/stats-response-histo-out 2008 >$SOURCEG
+writetothem/bin/stats-response-histo-out 2005 >$SOURCED
+writetothem/bin/stats-response-histo-out 2006 >$SOURCEE
+writetothem/bin/stats-response-histo-out 2007 >$SOURCEF
+writetothem/bin/stats-response-histo-out 2008 >$SOURCEG
cat >$GPSCRIPT <<END
unset border
@@ -63,7 +63,7 @@ END
#echo "gpscript $GPSCRIPT"
export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera
-#gnuplot < $GPSCRIPT > fyr/web/fyr-live-signups$EXTENSION
+#gnuplot < $GPSCRIPT > writetothem/web/fyr-live-signups$EXTENSION
gnuplot < $GPSCRIPT > /tmp/fyr-stats-response-histo$EXTENSION
echo "Done - it's in /tmp/fyr-stats-response-histo$EXTENSION"
@@ -13,7 +13,7 @@
$bars = 10;
-include "fyr/phplib/questionnaire_report_$argv[1]_WMC.php";
+include "writetothem/phplib/questionnaire_report_$argv[1]_WMC.php";
$histvals = array();
$total_mps = 0;
View
@@ -11,7 +11,7 @@
*
*/
-require_once '../../phplib/sparkline/lib/Sparkline_Box.php';
+require_once '../commonlib/phplib/sparkline/lib/Sparkline_Box.php';
require_once '../phplib/questionnaire_report_2005_WMC.php';
$data = array();
foreach ($questionnaire_report_2005_WMC as $key => $row) {
@@ -27,7 +27,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use CGI;
use DateTime;
@@ -57,7 +57,7 @@ die "enter a reasonable year as first argument, or 2005post for 2005 post-electi
($year ne "2005post" && ($year < 2000 || $year > 5000));
my $output_format = shift;
# Output formats are:
-# PHP - for fyr/phplib/questionnaire_report_2005_WMC.php and the like
+# PHP - for writetothem/phplib/questionnaire_report_2005_WMC.php and the like
# debug - for debugging, only prints 'unknown' MPs
# thorough - as debug, but flags more MPs as needing manual checking
# mapcsv - for plotting responsivness/activity maps of country
@@ -704,7 +704,7 @@ my $total_responded_outof = 0;
my $total_firsttime = 0;
my $total_firsttime_outof = 0;
my $total_fails_after_dispatch = 0;
-print "<?php\n/* Automatically generated by fyr/bin/stats-yearly-response */\n\n" if $output_format eq "PHP";
+print "<?php\n/* Automatically generated by writetothem/bin/stats-yearly-response */\n\n" if $output_format eq "PHP";
print "\$questionnaire_report_${year}_${area_type} = array(\n" if $output_format eq "PHP";
print "Constituency,Mean responsiveness,Messages sent,Seconds of valid contact details,Messages sent / day\n" if ($output_format eq 'mapcsv');
foreach my $person_id (keys %$reps_by_person) {
@@ -16,7 +16,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use CGI;
use DateTime;
@@ -150,7 +150,7 @@ my $total_responded = 0;
my $total_responded_outof = 0;
my $total_firsttime = 0;
my $total_firsttime_outof = 0;
-print "<?php\n/* Automatically generated by fyr/bin/stats-yearly-zeitgeist */\n\n";
+print "<?php\n/* Automatically generated by writetothem/bin/stats-yearly-zeitgeist */\n\n";
print "\$zeitgeist_by_summary_type_${year} = array(\n";
foreach my $summary_type (keys %$summary_types) {
my $data = $r->{$summary_type};
View
@@ -11,7 +11,7 @@
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Getopt::Long;
chdir $FindBin::Bin;
View
@@ -15,7 +15,7 @@
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
chdir $FindBin::Bin;
use File::Slurp;
View
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../../perllib
+#!/usr/bin/perl -w -I../commonlib/perllib
#
# test-run:
# Test harness for WriteToThem. Makes sure we haven't broken the code.
@@ -48,7 +48,7 @@ use mySociety::DBHandle qw(dbh);
use mySociety::WebTestHarness;
use mySociety::Ratty;
use FindBin;
-use lib "$FindBin::Bin/../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use FYR::TestHarness qw(email_n name_n call_fyrqd set_fyr_date spin_queue send_message_to_rep check_delivered_to_rep call_allow_new_survey call_handlemail confirm_message);
use FYR::Cobrand;
@@ -101,8 +101,8 @@ mySociety::Ratty::admin_delete_rules('fyr-abuse');
$wth->fax_setup();
# Syntax check all .php files
print "Syntax check all PHP files...\n" if $verbose > 0;
-$wth->php_check_syntax("../../fyr/");
-$wth->php_check_syntax("../../fyr/templates/emails/", qr//);
+$wth->php_check_syntax("../../writetothem/");
+$wth->php_check_syntax("../../writetothem/templates/emails/", qr//);
my $expected_messages = { enter_postcode => 'First, type your UK postcode:',
select_rep => "Now select the representative you'd like to contact",
select_lord => 'Which Lord would you like to write to?',
View
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I../perllib -I../../perllib
+#!/usr/bin/perl -I../perllib -I../commonlib/perllib
# Takes postcodes, one per line, on stdin
View
@@ -17,7 +17,7 @@ require 5.8.0;
# Horrible boilerplate to set up appropriate library paths.
use FindBin;
use lib "$FindBin::Bin/../perllib";
-use lib "$FindBin::Bin/../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
use Getopt::Long;
use mySociety::Config;
View
@@ -15,7 +15,7 @@
require_once "../conf/general";
require_once "../phplib/queue.php";
$long_opts = array('help', 'verbose');
-require_once '../../phplib/phpcli.php';
+require_once '../commonlib/phplib/phpcli.php';
$switches = $options[0];
$args = $options[1];
Oops, something went wrong.

0 comments on commit 461700f

Please sign in to comment.