Changeset 182

Timestamp:

12/27/05 11:08:35 (18 years ago)

Author:

thauvin

Message:

• remove complex code, no longer in use

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData/Repository.pm

@@ -390 +390 @@
 =cut
 
-my $checks = {
-    archive_exists => sub {
-        my ($self) = @_;
-        my $res;
-        if($self->{status}->SectionExists($self->{archivefile})) {
-            $res = 1;
-        } else {
-            $res = 0;
-        }
-        return(
-            $res, 
-            $self->logging(0,
-                "%s/%s is%s new archive",
-                $self->{dir},
-                $self->{archivefile},
-                $res ? " not" : "",
-            )
-        );      
-    },
-
-    archive_size => sub {
-        my ($self) = @_;
-        my $res;
-        if (defined(my $oldsize = $self->getvalue('size')) &&
-            defined(my $size = (stat("$self->{dir}/$self->{archivefile}"))[7])) {
-            my $res = $size <=> $oldsize;
-            return $res, $self->logging(0,
-                "Size for %s/%s %s",
-                $self->{dir},
-                $self->{archivefile},
-                $res == 0 ?
-                    sprintf("does not differ (%d)", $size) :
-                    sprintf("differ %d => %d", $oldsize, $size)
-            );
-        }
-    },
-
-    archive_mtime => sub {
-        my ($self) = @_;
-        my $res;
-        if (defined(my $oldmtime = $self->getvalue('mtime')) &&
-            defined(my $mtime = (stat("$self->{dir}/$self->{archivefile}"))[9])) {
-            my $res = $mtime <=> $oldmtime;
-            return $res, $self->logging(0,
-                "Mtime for %s/%s %s",
-                $self->{dir},
-                $self->{archivefile},
-                $res == 0 ?
-                    sprintf("does not differ (%d)", $mtime) :
-                    sprintf("differ %d => %d", $oldmtime, $mtime)
-            );
-        }
-    },
-
-    dest_exists => sub {
-        my ($self, $check, $datafile, $dest) = @_;
-        if (-e $dest) {
-            return 1, "$dest exists";
-        } else {
-            return 0, "$dest don't exists";
-        }
-    },
-
-    data_extracted => sub {
-        my ($self, $check, $datafile) = @_;
-        my $last_process = $self->get_data_value($datafile, 'processtime');
-        if ($last_process) {
-            $self->logging(0, "%s/%s has been already processed at %s",
-                $self->{archivefile},
-                $datafile,
-                scalar(localtime($last_process)),
-            );
-        }
-        $last_process
-    },
-};
-
 #sub DESTROY {
 #    my ($self) = @_;
@@ -472 +395 @@
 #    $self->SUPER::DESTROY();
 #}
-
-=head3 do_check($check, @args)
-
-Perform $check with @args if exists and return result of check
-
-=cut
-
-sub do_check {
-    my ($self, $check, @args) = @_;
-    
-    if (!$checks->{$check}) {
-        die $self->logging(5,
-            "check %s does not exists, exiting now",
-            $check
-        );
-    }
-    
-    return $checks->{$check}->($self, $check, @args);
-}
-
-sub populate_event {
-    my ($self, $oevent, @args) = @_;
-    my ($code, $text);
-    
-    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)
@@ -536 +417 @@
         };
     }
-}
-
-=head3 do_continue($why, $message, @args)
-
-Perform default or call the interactive callback.
-
-    $why is the reason of the call
-    @args are argument to passed to callback
-
-=cut
-
-sub do_continue {
-    my ($self, $why, $message, @args) = @_;
-
-    $self->logging(0, "Event($why): $message");
-    my $oevent = ObsData::Event->new($why, $message);
-    $self->populate_event(
-        $oevent, @args
-    );
-
-    my $res =
-        $self->{interactive_callback} ?
-        $self->{interactive_callback}->($self, $oevent) :
-        $self->default_choice($oevent);
-    $self->logging(0, "Event(%s): Result: %s", $why, $res);
-    return($res);
 }
 

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

@@ -9 +9 @@
 use_ok('ObsData');
 use_ok('ObsData::Repository');
+use ObsData::Event;
 
 my $o = ObsData->new('testdata/obsdata-conftest', logfile => "testdata/obsdata.log");
@@ -52 +53 @@
     ok($or->get_data_value('ozone34', 'BAR') eq 'BAR', "can get a value");
 
-    ok($or->do_continue('overwrite', '-', 'a', 'a') eq 1, "Perform do_continue");
+    my $oe = ObsData::Event->new('overwrite', '--');
+    ok($or->ask_user($oe), "Ask user");
     ok($callbackwhy eq 'overwrite', "arg are properly passed to callback");
     ok($or->list_archive, "Can list archive content");

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

@@ -4 +4 @@
 use warnings;
 
-use Test::More tests => 8;
+use Test::More tests => 3;
 use File::Temp qw(tempdir);
 
@@ -28 +28 @@
     );
     isa_ok($or, "ObsData::Repository::dir::archive");
-    ok($or->do_check('archive_exists'), "can perform check archive_exists");
-    ok(!$or->do_check('archive_size'), "can perform check archive_size");
-    ok(!$or->do_check('archive_mtime'), "can perform check archive_mtime");
-    ok($or->do_check('dest_exists', 'ozone34', '34/ozone34'), "can perform check dest_exists");
-    ok($or->do_check('data_extracted', 'ozone34'), "can perform check data_extracted");
 }