Changeset 89

Timestamp:

12/02/05 09:41:53 (19 years ago)

Author:

thauvin

Message:

• add loadarchive()

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData/Repository.pm

@@ -244 +244 @@
 }
 
+sub loadarchive {
+    my ($self) = @_;
+    if ($self->{Oarchive}) {
+        return 1;
+    } else {
+        $self->{Oarchive} = ObsData::Archive->new("$self->{dir}/$self->{archivefile}");
+        if ($self->{Oarchive}) {
+            $self->loging(0,
+                "Archive %s/%s properly load",
+                $self->{dir}, $self->{archivefile}
+            );
+            return 1;
+        } else {
+            $self->loging(4, 
+                "Can't handle archive %s/%s: %s, skipping",
+                $self->{dir}, $self->{archivefile},
+                ObsData::Archive->error
+            );
+            return 0;
+        }
+    }
+}
+
 sub update_status {
     my ($self) = @_;
@@ -259 +282 @@
     my ($self) = @_;
 
-    $self->loging(0, "trying to read archive content of %s", $self->{archivefile});
-    $self->{Oarchive} = ObsData::Archive->new("$self->{dir}/$self->{archivefile}") or do {
-        $self->loging(4, 
-            "Can't handle archive %s: %s, skipping",
-            $self->{archivefile},
-            ObsData::Archive->error
-        );
-        return;
-    };
+    $self->loadarchive or return;
 
     foreach my $datafile ($self->{Oarchive}->ls) {

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 7;
+use Test::More tests => 8;
 use File::Temp qw(tempdir);
 
@@ -31 +31 @@
     );
     isa_ok($or, "ObsData::Repository::dir::archive");
+    ok($or->loadarchive, "Can load an archive");
 }