Changeset 172

Timestamp:

12/20/05 19:34:30 (18 years ago)

Author:

thauvin

Message:

• pass both id and message to do_continue

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData/Repository.pm

@@ -241 +241 @@
             archivefile => $file,
         );
-        if(!$orda->do_continue('do_archive')) {
+        if(!$orda->do_continue('do_archive', "Should I parse $file")) {
             $self->logging(0,
                 "Archive %s/%s allready parsed, skipping",
@@ -517 +517 @@
 }
 
-=head3 do_continue($why, @args)
+=head3 do_continue($why, $message, @args)
 
 Perform default or call the interactive callback.
@@ -527 +527 @@
 
 sub do_continue {
-    my ($self, $why, @args) = @_;
-
-    my $oevent = ObsData::Event->new($why, $why);
+    my ($self, $why, $message, @args) = @_;
+
+    $self->logging(0, "Event($why): $message");
+    my $oevent = ObsData::Event->new($why, $message);
     $self->populate_event(
         $oevent, @args
     );
 
-    if ($self->{interative_callback}) {
-        return $self->{interative_callback}->($self, $oevent);
-    } else {
-        return $self->default_choice($oevent);
-    }
+    my $res =
+        $self->{interative_callback} ?
+        $self->{interative_callback}->($self, $oevent) :
+        $self->default_choice($oevent);
+    $self->logging(0, "Event(%s): Result: %s", $why, $res);
+    return($res);
 }
 
@@ -638 +640 @@
     }
     
-    if(!$self->do_continue('overwrite', $datafile, $destfile)) {
+    if(!$self->do_continue(
+            'overwrite',
+            "Should I overwrite $destfile",
+            $datafile, 
+            $destfile)) {
         $self->logging(3,
             "%s extracted from %s/%s already exists, I won't overwrite it",
@@ -712 +718 @@
 
     foreach my $data ($self->list_archive) {
-        if (!$self->do_continue('do_data', $data)) {
+        if (!$self->do_continue(
+                'do_data', 
+                "Should I extract $data from $self->{archivefile}", 
+                $data)) {
             $self->logging(0,
                 "%s/%s has allready processed, skipping",

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

@@ -52 +52 @@
     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");
+    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");