Add commonlib, update paths and ignores.

mysociety · Aug 1, 2011 · a6891ab · a6891ab
1 parent 96d208a
commit a6891ab
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+_Inline
+/conf/general
+/conf/general.deployed
+/web/down.html
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "commonlib"]
+	path = commonlib
+	url = git://git.mysociety.org/commonlib
diff --git a/bin/.cvsignore b/bin/.cvsignore
diff --git a/bin/geonames-parse b/bin/geonames-parse
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../perllib -I../../../perllib
+#!/usr/bin/perl -w
 #
 # geonames-parse:
 # Parse GEOnet Names Server data and load into gazetteer database.
@@ -14,19 +14,15 @@
 # For US see usgs-geonames-parse
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: geonames-parse,v 1.29 2007-06-19 14:28:28 francis Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 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/../../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
 
 use IO::File;
 use POSIX qw(acos);

diff --git a/bin/geonames-split b/bin/geonames-split
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../perllib -I../../../perllib
+#!/usr/bin/perl -w
 #
 # geonames-split:
 # Split GEOnet names file containing many countries into separate files
@@ -9,19 +9,15 @@
 # Get country file as described in load-all
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: geonames-split,v 1.3 2007-06-19 14:28:28 francis Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 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/../../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
 
 use IO::File;
 use POSIX qw(acos);

diff --git a/bin/gpw-parse b/bin/gpw-parse
@@ -25,10 +25,7 @@
 # OPTION_GAZE_GPW_DATA_DIR in the services config file.
 # 
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: gpw-parse,v 1.4 2005-12-01 17:02:08 francis Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 require 5.8.0;

diff --git a/bin/load-all b/bin/load-all
@@ -16,7 +16,7 @@
 # Specify two letter country code as parameter to just do that country.
 
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 set -e
 #set -x # debug

diff --git a/bin/search b/bin/search
@@ -1,22 +1,18 @@
-#!/usr/bin/perl -w -I../perllib -I../../../perllib
+#!/usr/bin/perl -w
 #
 # search:
 # Test search script.
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: search,v 1.6 2006-01-16 18:22:38 francis Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 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/../../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
 
 use mySociety::Config;
 BEGIN {

diff --git a/bin/test-all b/bin/test-all
@@ -3,7 +3,7 @@
 # Tests Xapian database has been made for all countries
 
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 BINPATH=`dirname $0`
 for FILE in split-??.txt

diff --git a/bin/usgs-geonames-parse b/bin/usgs-geonames-parse
@@ -8,19 +8,15 @@
 # (use the DECI one for decimal, rather than the degrees/mins/secs one)
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: usgs-geonames-parse,v 1.10 2007-06-19 14:46:52 francis Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 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/../../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
 
 use Geo::Distance;
 use IO::File;

diff --git a/bin/xapian-compact b/bin/xapian-compact
@@ -9,13 +9,13 @@
 # services/Gaze/conf/general
 #
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
-# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 #
 
 set -e
 
 BINPATH=`dirname $0`
-. $BINPATH/../../../shlib/deployfns
+. $BINPATH/../commonlib/shlib/deployfns
 
 TOTAL_SAVED=0
 read_conf $BINPATH/../conf/general

diff --git a/bin/xapian-index b/bin/xapian-index
@@ -10,19 +10,15 @@
 # services/Gaze/conf/general
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: xapian-index,v 1.9 2006-10-11 17:47:59 chris Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 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/../../../perllib";
+use lib "$FindBin::Bin/../commonlib/perllib";
 
 use IO::File;
 use POSIX qw(acos);

diff --git a/commonlib b/commonlib
diff --git a/conf/.cvsignore b/conf/.cvsignore
diff --git a/conf/general-example b/conf/general-example
@@ -11,9 +11,7 @@
  * have multiple config files and use a symlink to change between them.
  * 
  * Copyright (c) 2004 UK Citizens Online Democracy. All rights reserved.
- * Email: francis@mysociety.org; WWW: http://www.mysociety.org
- *
- * $Id: general-example,v 1.1 2006-01-16 18:22:38 francis Exp $
+ * Email: matthew@mysociety.org; WWW: http://www.mysociety.org
  * 
  */
 

diff --git a/conf/httpd.conf b/conf/httpd.conf
@@ -19,9 +19,7 @@
 #
 # 
 # Copyright (c) 2004 UK Citizens Online Democracy. All rights reserved.
-# Email: francis@mysociety.org; WWW: http://www.mysociety.org
-# 
-# $Id: httpd.conf,v 1.1 2006-01-16 18:22:38 francis Exp $
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org
 
 # CGI files can be referred without CGI
 RewriteEngine on

diff --git a/db/schema.sql b/db/schema.sql
@@ -3,9 +3,7 @@
 -- Schema for gazetteer service.
 --
 -- Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
--- Email: chris@mysociety.org; WWW: http://www.mysociety.org/
---
--- $Id: schema.sql,v 1.12 2006-12-01 15:35:21 matthew Exp $
+-- Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 --
 
 create table feature (

diff --git a/perllib/Gaze.pm b/perllib/Gaze.pm
@@ -3,9 +3,7 @@
 # Common code for global gazetteer.
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: Gaze.pm,v 1.39 2007-10-19 19:20:28 matthew Exp $
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 #
 
 package Gaze;

diff --git a/web/.cvsignore b/web/.cvsignore
diff --git a/web/gaze-rest.cgi b/web/gaze-rest.cgi
@@ -1,13 +1,10 @@
-#!/usr/bin/perl -w -I../perllib -I../../../perllib
+#!/usr/bin/perl -w -I../perllib -I../commonlib/perllib
 #
 # gaze-rest.cgi:
 # "RESTful" interface to Gaze.
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: gaze-rest.cgi,v 1.28 2008-11-03 09:58:49 matthew Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;
 

diff --git a/web/gaze.cgi b/web/gaze.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I../perllib -I../../../perllib
+#!/usr/bin/perl -w -I../perllib -I../commonlib/perllib
 #
 # gaze.cgi:
 # RABX server.
@@ -8,10 +8,7 @@
 #     SetHandler fastcgi-script
 #
 # Copyright (c) 2005 UK Citizens Online Democracy. All rights reserved.
-# Email: chris@mysociety.org; WWW: http://www.mysociety.org/
-#
-
-my $rcsid = ''; $rcsid .= '$Id: gaze.cgi,v 1.17 2008-02-04 19:00:13 matthew Exp $';
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 use strict;