Changeset 46

Timestamp:

11/23/05 15:33:24 (19 years ago)

Author:

thauvin

Message:

• use object for init_repository
• don't print to STDOUT anymore
• improve load()

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (6 diffs, 1 prop)
• t/O-01.t (modified) (2 diffs, 1 prop)
• t/O-02.t (modified) (2 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -46 +46 @@
             -allowcontinue => 1
         ),
-        verbose => 1,
+        verbose => defined($options{verbose}) ? $options{verbose} : 1,
+        logcallback => $options{logcallback},
+        dir => $options{dir},
+
     };
 
@@ -55 +58 @@
     $obsdata->{config} or return undef;
 
-    $obsdata->{dir} = $options{dir} || $obsdata->{config}->val('global', 'dir');
-
     bless($obsdata, $class);
+
 }
 
@@ -73 +75 @@
     my ($self) = @_;
 
+    if (! ($self->{dir} ||= $self->{config}->val('global', 'dir'))) {
+        $self->loging(5, "Data directory not defined", $self->{dir});
+        return 0;
+    }
+    
+    if (! -d $self->{dir}) {
+        $self->loging(5, "Data directory %s does not exists", $self->{dir});
+        return 0;
+    }
+
     if (!open($self->{loghandle}, ">> $self->{dir}/logs/obsdata.log")) {
+        $self->{loghandle} = undef;
         $self->loging(5, "Can't open log file %s, exiting", "$self->{dir}/logs/obsdata.log");
         return 0;
@@ -84 +97 @@
     my ($self, $level, $fmt, @val) = @_;
     my $msg = sprintf($fmt, @val);
-    my $logh = $self->{loghandle} || \*STDERR;
+    my $logh = $self->{loghandle};
     if($level >= 0 && $level >= $self->{verbose}) {
         if ($self->{logcallback}) {
             $self->{logcallback}->($level, $msg);
         }
-        printf $logh 
-            "[%s] %s %s\n", $loglevel[$level] || "coin",
-            strftime("%b %d %H:%M:%S %Y", gmtime),
-            $msg;
+        if ($logh) {
+            printf $logh 
+                "[%s] %s %s\n", $loglevel[$level] || "coin",
+                strftime("%b %d %H:%M:%S %Y", gmtime),
+                $msg;
+        }
     }
     $msg
@@ -98 +113 @@
 
 sub init_repository {
-    my ($dir) = @_;
-
-    if (!-d $dir) {
-        mkdir $dir or return 0;
-    }
-
-    if (!-d "$dir/logs") {
-        mkdir "$dir/logs" or return 0;
+    my ($self) = @_;
+
+    if (!-d $self->{dir}) {
+        mkdir $self->{dir} or return 0;
+    }
+
+    if (!-d "$self->{dir}/logs") {
+        mkdir "$self->{dir}/logs" or return 0;
     } 
 
-    my $db = DBI->connect("dbi:SQLite:dbname=$dir/obsdata.db","","",
+    my $db = DBI->connect("dbi:SQLite:dbname=$self->{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);
+    $self->load or return 0;
+    $self->loging(1, "Repository succefully created in %s", $self->{dir});
 
     1;
@@ -231 +245 @@
 }
 
+sub find_file_obs {
+    my ($self, $obs) = @_;
+    my %datadir = $self->list_obsdatadir($obs);
+    $self->loging(0, "Starting %s() for %s", (caller(0))[3], $obs);
+    
+    foreach my $datatype (keys %datadir) {
+        if(opendir(my $dirhandle, $datadir{$datatype})) {
+            close($dirhandle);
+        } else {
+            $self->loging(5, "can't open directory %s set for %s", $datadir{$datatype}, $obs);
+        }
+    }
+}
+
 1;

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 5;
+use Test::More tests => 4;
 
 use_ok('ObsData');
@@ -9 +9 @@
 can_ok('ObsData', qw(list_obs list_obsdatadir list_typedatadir get_datadir getvalue is_obs));
 
-ok(ObsData->new('testdata/obsdata-conftest'), "Can create object");
 ok(!ObsData->new('testdata/wrongfile'), "Return an error on bad file");

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 15;
+use Test::More tests => 16;
 use File::Temp qw(tempdir);
 
@@ -7 +7 @@
 
 my $td = tempdir;
-ok(ObsData::init_repository($td), "Can initialize repos data");
+{
+my $o = ObsData->new(undef, dir => $td);
+ok($o->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->load, "can load repository");
 ok($o->is_obs('ohp'), "Isobs works");
 ok(!$o->is_obs('ozone'), "Isobs works");