# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1227615326 -28800
# Node ID aaffc50e3318ce470a53b6668d8f3adbd2e67b8d
# Parent  3b3f1306255a0a9d4d503346bf72b0bb3e5e19ad
try to handle db_error

diff -r 3b3f1306255a -r aaffc50e3318 Ikariam.pm
--- a/Ikariam.pm	Mon Nov 24 17:44:43 2008 +0800
+++ b/Ikariam.pm	Tue Nov 25 20:15:26 2008 +0800
@@ -1,14 +1,29 @@
+
 BEGIN {
     foreach (((getpwuid($<))[7], $ENV{HOME}, $ENV{LOGDIR}, ".")) {
         require "$_/.eagleeye.pm" if (-f "$_/.eagleeye.pm");
     }
 }
 
+package Ikariam::Base;
+use strict;
+require Class::DBI::SQLite;
+use base qw(Class::DBI::SQLite);
+
+sub _db_error {
+    my ($self, %info) = @_;
+    my $msg = delete $info{msg};
+    die($msg);
+# return $self->_carp($msg, %info);
+}
+
+1;
+
 use Class::DBI::AutoLoader (
     dsn       => 'dbi:SQLite:dbname=ikariam.sqlite',
     options   => { RaiseError => 1 },
     tables    => ['cities', 'island', 'user', 'ally', 'report'],
-    use_base  => 'Class::DBI::SQLite',
+    use_base  => 'Ikariam::Base',
     namespace => 'Ikariam',
 );
 
diff -r 3b3f1306255a -r aaffc50e3318 scan.pl
--- a/scan.pl	Mon Nov 24 17:44:43 2008 +0800
+++ b/scan.pl	Tue Nov 25 20:15:26 2008 +0800
@@ -25,12 +25,6 @@
     return bless $self, $class;
 }
 
-sub _croak {
-    my ($self, $message, %info) = @_;
-    Error->throw(-text => $message, %info);
-    return;
-}
-
 sub saveCities
 {
     my ($self, $island, @cities) = @_;