Changeset 111

Timestamp:

12/11/05 02:36:09 (18 years ago)

Author:

thauvin

Message:

• make directory mandatory in parent class then abort before bless and so don't have to call DESTROY which make save_status to failed

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData/Repository.pm

@@ -34 +34 @@
     # statusfile
     # status Config::IniFile object to store extraction info
+    # dir based directory where archive are located
+    $or->{dir} or die "No dir given";
+    -d $or->{dir} or return undef;
+    # patern glob() over file
     
     $or->{status} ||= new Config::IniFiles(
@@ -76 +80 @@
     my ($class, $infos, %param) = @_;
 
-    my $or = ObsData::Repository->new($infos, %param);
-    # dir directory to parse
-    # patern glob() over file
-    $or->{dir} or die "No dir given";
+    my $or = ObsData::Repository->new($infos, %param) or return;
 
     bless($or, $class);
@@ -136 +137 @@
     my ($class, $infos, %param) = @_;
 
-    my $or = ObsData::Repository->new($infos, %param);
+    my $or = ObsData::Repository->new($infos, %param) or return;
     # dir directory to parse
-    # patern glob() over file
-    $or->{dir} or die "No dir given";
     $or->{archivefile} or die "No archivefile given";
 

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

@@ -11 +11 @@
     { 
         obsdata => $o,
+        dir => '.',
     }
 );