Changeset 43 for trunk

Timestamp:

11/22/05 17:39:56 (19 years ago)

Author:

thauvin

Message:

• move repository to ObsData? class

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (4 diffs, 1 prop)
• ObsData/Repository.pm (modified) (2 diffs, 1 prop)
• t/O-01.t (modified) (1 diff, 1 prop)
• t/O-02.t (modified) (2 diffs, 1 prop)
• t/OR-01.t (modified) (1 diff, 1 prop)
• t/OR-02.t (modified) (1 diff, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -6 +6 @@
 use warnings;
 use Config::IniFiles;
+use DBD::SQLite;
+
+my @loglevel = (
+    'DEBUG',
+    'INFO',
+    'RESULT',
+    'WARNING',
+    'ERROR',
+    'FATAL',
+);
 
 our $VERSION = 0.01;
@@ -28 +38 @@
 
 sub new {
-    my ($class, $configfile) = @_;
+    my ($class, $configfile, %options) = @_;
     my $obsdata = {
         config => new Config::IniFiles(
@@ -35 +45 @@
             -allowcontinue => 1
         ),
+        verbose => 1,
     };
-    
+
     if ($configfile) {
         (-f $configfile && -r _) or return undef;
@@ -43 +54 @@
     $obsdata->{config} or return undef;
 
+    $obsdata->{dir} = $options{dir} || $obsdata->{config}->val('global', 'dir');
+
     bless($obsdata, $class);
 }
+
+sub DESTROY {
+    my ($self) = @_;
+
+    if ($self->{loghandle}) {
+        close($self->{loghandle});
+        $self->{loghandle} = undef;
+    }
+    
+}
+
+sub load {
+    my ($self) = @_;
+
+    if (!open($self->{loghandle}, "> $self->{dir}/logs/obsdata.log")) {
+        $self->loging(5, "Can't open log file %s, exiting", "$self->{dir}/logs/obsdata.log");
+        return 0;
+    }
+    
+    return 1;
+}
+
+sub loging {
+    my ($self, $level, $fmt, @val) = @_;
+    my $msg = sprintf($fmt, @val);
+    my $logh = $self->{loghandle} || \*STDERR;
+    if($level >= 0 && $level >= $self->{verbose}) {
+        if ($self->{logcallback}) {
+            $self->{logcallback}->($level, $msg);
+        }
+        print $logh "$msg\n";
+    }
+    $msg
+}
+
+sub init_repository {
+    my ($dir) = @_;
+
+    if (!-d $dir) {
+        mkdir $dir or return 0;
+    }
+
+    if (!-d "$dir/logs") {
+        mkdir "$dir/logs" or return 0;
+    } 
+
+    my $db = DBI->connect("dbi:SQLite:dbname=$dir/obsdata.db","","",
+        { RaiseError => 1, AutoCommit => 1}
+    ) or return 0;
+
+    my $odr = ObsData->new(undef, dir => $dir);
+    $odr->load or return 0;
+    $odr->loging(1, "Repository succefully created in %s", $dir);
+
+    1;
+}
+
 
 =head2 checkconfig()

trunk/soft/ObsData/ObsData/Repository.pm

@@ -6 +6 @@
 use warnings;
 use ObsData;
-use DBD::SQLite;
 
 our @ISA = qw(ObsData);
-
-my @loglevel = (
-    'DEBUG',
-    'INFO',
-    'RESULT',
-    'WARNING',
-    'ERROR',
-    'FATAL',
-);
 
 =head1 METHODS
@@ -23 +13 @@
 =head2 new
 
-Parameters list:
-
-=item configfile
-
-The configuration file to use
-
-=item sublog
-
-Coderef to external loging function
-
-=item subloglevel
-
-Minimum log level to call sublog, default is 1
-
-=item minloglevel
-
-Minimum loglevel for internal logging
-
-=item dir
-
-The directory where internal data are put
-
 =cut
 
 sub new {
-    my ($class, %config) = @_;
+    my ($class, $obsdata) = @_;
 
-    my $odr = $class->SUPER::new($config{configfile}) or return undef;
-
-    $odr->{sublog} = $config{sublog};
-    $odr->{subloglevel} = defined($config{subloglevel}) ? $config{subloglevel} : 1;
-    $odr->{minloglevel} = defined($config{minloglevel}) ? $config{minloglevel} : 1;
-
-    if(!($config{dir} && -d $config{dir})) {
-        return undef;
-    }
-
-    open($odr->{loghandle}, "> $config{dir}/logs/obsdata.log") or return undef; 
+    $obsdata or return undef;
     
-    bless($odr, $class);
-}
-
-=head2 logmsg
-
-Add a message to log stack
-
-Parameters list:
-
-=item loglevel 
-
-The log level of message (num or text)
-
-=item info
-
-hash ref to additionnal info
-
-=item message ...
-
-printf like args
-
-=cut
-
-sub logmsg {
-    my ($self, $level, $info, $pf, @pfa) = @_;
-    my $textlevel = $level =~ /^\d+$/ ? $loglevel[$level] : $level;
-    my $nlevel = logleveln($textlevel);
-    
-    my @call = caller;
-    
-    $textlevel ||= "";
-    if (!defined($nlevel)) {
-        $textlevel = 'INFO';
-        $nlevel = logleveln($textlevel);
-        $self->logmsg('ERROR', undef,
-           'Invalid use of loglevel "%s" at %s line %d, unsing %s"',
-           $level || "", $call[1], $call[2], $textlevel);
-    }
-
-    if ($self->{minloglevel} <= $nlevel) {
-       my $h = $self->{loghandle};
-       print $h "[$textlevel]: " . sprintf($pf, @pfa) . "\n";
-    }
-
-    if ($self->{sublog} && $self->{subloglevel} <= $nlevel) {
-       $self->{sublog}->($textlevel, $info, sprintf($pf, @pfa));
-    }
-
-}
-
-sub logleveln {
-    my ($t) = @_;
-    my $i = 0;
-    foreach (@loglevel) {
-        return $i if ($t eq $_);
-        $i++
-    }
-    return undef;
-}
-
-sub init_repository {
-    my ($dir) = @_;
-
-    if (!-d $dir) {
-        mkdir $dir or return 0;
-    }
-
-    if (!-d "$dir/logs") {
-        mkdir "$dir/logs" or return 0;
-    } 
-
-    my $db = DBI->connect("dbi:SQLite:dbname=$dir/obsdata.db","","",
-        { RaiseError => 1, AutoCommit => 1}
-    ) or return 0;
-
-    my $odr = ObsData::Repository->new(dir => $dir);
-    $odr->logmsg('INFO', undef, "Repository succefully created in %s", $dir);
-
-    1;
+    bless($obsdata, $class);
 }
 

trunk/soft/ObsData/t/O-01.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 4;
+use Test::More tests => 5;
 
 use_ok('ObsData');
+
+can_ok('ObsData', qw(init_repository));
 
 can_ok('ObsData', qw(list_obs list_obsdatadir list_typedatadir get_datadir getvalue is_obs));

trunk/soft/ObsData/t/O-02.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 12;
+use Test::More tests => 15;
+use File::Temp qw(tempdir);
 
 use_ok('ObsData');
 
-ok(my $o = ObsData->new('testdata/obsdata-conftest'), "Can create object");
+my $td = tempdir;
+ok(ObsData::init_repository($td), "Can initialize repos data");
+ok(-f "$td/obsdata.db", "db is really create");
+ok(-d "$td/logs", "log directory exists");
+
+ok(my $o = ObsData->new('testdata/obsdata-conftest', dir => $td), "Can create object");
 ok($o->is_obs('ohp'), "Isobs works");
 ok(!$o->is_obs('ozone'), "Isobs works");
@@ -24 +30 @@
 ok(eq_set([ $o->list_datatype ], [ 'oxygene', 'ozone' ]), "can get data type");
 print STDERR join(" ", $o->list_datatype);
+
+system("rm -fr $td"); 

trunk/soft/ObsData/t/OR-01.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 4;
+use Test::More tests => 2;
 
 use_ok('ObsData::Repository');
 
-can_ok('ObsData::Repository', qw(list_obs list_obsdatadir list_typedatadir get_datadir getvalue is_obs));
-can_ok('ObsData::Repository', qw(init_repository));
-
 ok(!ObsData::Repository->new(), "Return an error on bad file");

trunk/soft/ObsData/t/OR-02.t

@@ -1 @@
-
 # $Id$
 
-use Test::More tests => 6;
+use Test::More tests => 1;
 use File::Temp qw(tempdir);
 use ObsData::Repository;
 
-{
-my $td = tempdir;
-ok(ObsData::Repository::init_repository($td), "Can initialize repos data");
-ok(-f "$td/obsdata.db", "db is really create");
-ok(-d "$td/logs", "log directory exists");
+ok(1, "Dummy test to keep file into cvs");
 
-ok(ObsData::Repository->new(configfile => 'testdata/obsdata-conftest', dir => $td), "Can create object");
-
-my $odr = ObsData::Repository->new(
-    configfile => 'testdata/obsdata-conftest', dir => $td,
-    sublog => sub { 
-        ok($_[0] eq "INFO", "Log Callback give good loglevel");
-        ok($_[2] eq "LOG MSG", "Log Callback give good message");
-    },
-);
-
-$odr->logmsg('INFO', undef, "LOG %s", 'MSG');
-# DEBUG msg are filtrered, so if more test are run, there is a pb here
-$odr->logmsg('DEBUG', undef, "LOG %s", 'MSG');
-$odr = undef;
-
-system("rm -fr $td");
-}