Changeset 230 for trunk/npemap.org.uk

Timestamp:

Oct 29, 2006, 6:10:20 PM (14 years ago)

Author:

Dominic Hargreaves

Message:

Better stats stuff

Location:

trunk/npemap.org.uk

Files:

• perllib/NPEMap/Config.pm (modified) (2 diffs)
• perllib/NPEMap/Postcodes.pm (modified) (1 diff)
• scripts/content/update_stats.pl (modified) (3 diffs)
• templates/home_stats.tt (modified) (1 diff)

trunk/npemap.org.uk/perllib/NPEMap/Config.pm

@@ -1 +1 @@
 package NPEMap::Config;
 
-use vars qw(@ISA @EXPORT $tt_config $rootdir $dbname);
+use vars qw(@ISA @EXPORT $tt_config $rootdir);
 use warnings;
 use strict;
@@ -9 +9 @@
 require Exporter;
 @ISA    = qw(Exporter);
-@EXPORT = qw($tt_config $dbname $dbhost $dbuser $dbpass);
+@EXPORT = qw($tt_config $dbname $dbhost $dbuser $dbpass $staticdir);
 
 # Read in site config

trunk/npemap.org.uk/perllib/NPEMap/Postcodes.pm

@@ -68 +68 @@
         datestats => $dateStats
     };
-    $template->process('home_stats.tt', $vars) or die $template->error();
+    
+    $template->process('home_stats.tt', $vars, $staticdir . '/stats.html')
+        or warn $template->error();
 }
 

trunk/npemap.org.uk/scripts/content/update_stats.pl

@@ -13 +13 @@
 use lib "$FindBin::Bin/../../perllib";
 use NPEMap::Postcodes;
-
-use vars qw($dbname $dbhost $dbuser $dbpass);
+use NPEMap;
 
 sub print_err;
 sub setup_dbh;
 
-# Read in database config
-my $config = 'npemap.conf';
-do $config or die "Can't read $config!\n";
-
-
-# No point in handling errors here since they'll get handled by the request
-# handler
 my $dbh;
 
-
     # In case the database went away, make sure we have a connection
-    unless (setup_dbh()) {
+    unless ($dbh = setup_dbh()) {
         print_internal_err('Error setting up database connection');
     }
@@ -36 +27 @@
 build_home_stats($dbh);
 
-
-# No more requests to serve, so tidy up
 $dbh->disconnect;
 
@@ -52 +41 @@
     print "Error: $err\n";
 }
-
-sub setup_dbh {
-    # $dbh is global
-    my $data_source = "dbi:Pg:dbname=$dbname";
-    $data_source .= ";host=$dbhost" if $dbhost;
-    return $dbh = DBI->connect_cached($data_source, $dbuser, $dbpass);
-}

trunk/npemap.org.uk/templates/home_stats.tt

@@ -1 @@
-Total postcodes collected by us: [% allstats.us %]
-Outward parts collected by us: [% allstats.us_out %]
-
+<ul>
+<li>Total postcodes collected: [% allstats.us %]</li>
+<li>Outward parts collected: [% allstats.us_out %]</li>
+</ul>