Changeset 168

Timestamp:

12/19/05 23:10:37 (18 years ago)

Author:

thauvin

Message:

• use ObsData::Event to manage event

Location:

trunk/soft/ObsData

Files:

• ObsData/Repository.pm (modified) (3 diffs, 1 prop)
• t/OR-03.t (modified) (3 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -9 +9 @@
 use ObsData;
 use ObsData::Archive;
+use ObsData::Event;
 use Config::IniFiles;
 
@@ -469 +470 @@
 }
 
-=head3 default_checks($why, @args)
-
-Perform defaults checks
-
-=cut
-
-sub default_checks {
-    my ($self, $why, @args) = @_;
-    
+sub populate_event {
+    my ($self, $oevent, @args) = @_;
     my ($code, $text);
     
-    if ($why eq 'do_archive') {
-        ($code, $text) = $self->do_check('archive_size');
-        if ($code) {
-            $self->logging(3, $text);
-        }
-
-        ($code, $text) = $self->do_check('archive_mtime');
-        if ($code) {
-            $self->logging(3, $text);
-        }
-        
-        ($code, $text) = $self->do_check('archive_exists');
-        if ($code != 0) {
-            $self->logging(0, "%s => skiping", $text);
-            return 0;
-        }
-    } elsif ($why eq 'do_data') {
-    
-    } elsif ($why eq 'overwrite') {
-        ($code, $text) = $self->do_check('dest_exists', @args);
-        if ($code) {
-            $self->logging(0, "%s", $text);
-            return 0;
-        } else {
-            $self->logging(0, "%s", $text);
-            return 1;
-        }
-    }
-    
-    1;
+    for ($oevent->id) {
+        /^do_archive$/ and do {
+            foreach my $t (qw(archive_size archive_mtime archive_exists)) {
+                ($code, $text) = $self->do_check($t);
+                $oevent->add_test($t, $text, $code);
+            }
+            last;
+        };
+        /^do_data$/ and do {
+            last;
+        };
+        /^overwrite$/ and do {
+            ($code, $text) = $self->do_check('dest_exists', @args);
+            $oevent->add_test('dest_exists', $text, $code);
+            last;
+        };
+    }
+}
+
+=head3 default_choice($oevent)
+
+=cut
+
+sub default_choice {
+    my ($self, $oevent) = @_;
+
+    for ($oevent->id) {
+        /^do_archive$/ and do {
+            last;
+        };
+        /^do_data$/ and do {
+            last;
+        };
+        /^overwrite$/ and do {
+            last;
+        };
+    }
 }
 
@@ -524 +525 @@
     my ($self, $why, @args) = @_;
 
+    my $oevent = ObsData::Event->new($why, $why);
+    $self->populate_event(
+        $oevent, @args
+    );
+
     if ($self->{interative_callback}) {
-        return $self->{interative_callback}->($self, $why, @args);
+        return $self->{interative_callback}->($self, $oevent);
     } else {
-        return $self->default_checks($why, @args);
+        return $self->default_choice($oevent);
     }
 }

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

@@ -1 +1 @@
 # $Id$
+
+use strict;
+use warnings;
 
 use Test::More tests => 14;
@@ -30 +33 @@
             archivefile => 'ozone34.gz',
             interative_callback => sub {
-                my ($self, $why, @args) = @_;
-                $callbackwhy = $why;
-                if ($why eq 'overwrite') {
+                my ($self, $event) = @_;
+                $callbackwhy = $event->id;
+                if ($callbackwhy eq 'overwrite') {
                     return 1;
                 } else {
-                    return $self->default_checks($why, @args);
+                    return $self->default_choice($event);
                 }
             },
@@ -49 +52 @@
     ok($or->get_data_value('ozone34', 'BAR') eq 'BAR', "can get a value");
 
-    ok($or->do_continue('overwrite') eq 1, "Perform do_continue");
+    ok($or->do_continue('overwrite', 'a', 'a') eq 1, "Perform do_continue");
     ok($callbackwhy eq 'overwrite', "arg are properly passed to callback");
     ok($or->list_archive, "Can list archive content");