Changeset 85

Timestamp:

12/01/05 12:02:13 (19 years ago)

Author:

thauvin

Message:

• rearrange class

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -276 +276 @@
     
     foreach my $datatype (keys %datadir) {
-        my $or = ObsData::Repository->new(
+        my $or = ObsData::Repository::dir->new(
             $self,
             $datadir{$datatype},

trunk/soft/ObsData/ObsData/Repository.pm

@@ -32 +32 @@
 
 =cut
+
+sub DESTROY {
+    my ($self) = @_;
+    $self->loging(0, "Destroy ObsData::Repository for %s", ref($self));
+    $self->save_status;
+}
+
+sub save_status {
+    my ($self) = @_;
+    $self->{status}->AddSection('.');
+    $self->{status}->SetSectionComment('.',
+        $ObsData::CVSID,
+        $ObsData::Repository::CVSID,
+        scalar(localtime),
+    );
+
+    $self->{status}->WriteConfig("$self->{dir}/obsdata.ini");
+}
+
+sub loging {
+    my $self = shift;
+    $self->{obsdata}->loging(@_);
+}
+
+sub set_do_if_change {
+    my ($self, %settings) = @_;
+    
+    foreach (keys %default_do_if_change) {
+        $self->{do_if_change}{$_} =
+            defined($settings{$_}) ? $settings{$_} : $default_do_if_change{$_};
+    }
+}
+
+package ObsData::Repository::dir;
+
+our @ISA = qw(ObsData::Repository);
 
 sub new {
@@ -57 +93 @@
 }
 
-sub DESTROY {
-    my ($self) = @_;
-    $self->loging(0, "Destroy ObsData::Repository for %s", ref($self));
-    $self->save_status;
-}
-
-sub save_status {
-    my ($self) = @_;
-    $self->{status}->AddSection('.');
-    $self->{status}->SetSectionComment('.',
-        $ObsData::CVSID,
-        $ObsData::Repository::CVSID,
-        scalar(localtime),
-    );
-
-    $self->{status}->WriteConfig("$self->{dir}/obsdata.ini");
-}
-
-sub loging {
-    my $self = shift;
-    $self->{obsdata}->loging(@_);
-}
-
-sub set_do_if_change {
-    my ($self, %settings) = @_;
-    
-    foreach (keys %default_do_if_change) {
-        $self->{do_if_change}{$_} =
-            defined($settings{$_}) ? $settings{$_} : $default_do_if_change{$_};
-    }
-}
-
 sub parse_files {
     my ($self) = @_;
@@ -106 +110 @@
             }
 
-            my $archive = ObsData::Repository::archive->new(
+            my $archive = ObsData::Repository::dir::archive->new(
                 $self,
                 $file
@@ -119 +123 @@
 }
 
-package ObsData::Repository::archive;
+package ObsData::Repository::dir::archive;
 
 our @ISA = qw(ObsData::Repository);
@@ -241 +245 @@
     foreach my $datafile ($self->{Oarchive}->ls) {
         $self->loging(0, "archive %s: content %s", $self->{archivefile}, $datafile);
-        my $data = ObsData::Repository::archive::data->new(
+        my $data = ObsData::Repository::dir::archive::data->new(
             $self,
             $datafile,
@@ -249 +253 @@
 }
 
-package ObsData::Repository::archive::data;
-
-our @ISA = qw(ObsData::Repository::archive);
+package ObsData::Repository::dir::archive::data;
+
+our @ISA = qw(ObsData::Repository);
 
 sub new {
@@ -303 +307 @@
 
     my $ltime = time;
-    $self->{status}->newval(
-        $self->{archivefile},
-        "data_processtime_$self->{datafile}",
-        $ltime
-    );
-    $self->{status}->newval(
-        $self->{archivefile},
-        "data_processversion_$self->{datafile}",
-        $ObsData::VERSION
-    );
-
-    $self->{status}->SetParameterComment(
-        $self->{archivefile}, 
-        "data_processtime_$self->{datafile}",
-        scalar(localtime($ltime)) . ", $ObsData::VERSION: $ObsData::CVSREV, $ObsData::Repository::CVSREV",
-    );
-
     
     if (!$datatype) {
@@ -327 +314 @@
             $self->{datafile}
         );
-        return;
     } elsif ($destfile) {
         $self->loging(0,
@@ -338 +324 @@
         if ($dirname && ! -d $dirname) {
             $self->loging(0, "Creating directory %s", $dirname);
-            File::Path::mkpath($dirname) or $self->loging(
-                4, "Can't create directory %s", 
-                $dirname
-            );
+            if( ! File::Path::mkpath($dirname)) { 
+                $self->loging(
+                    4, "Can't create directory %s", 
+                    $dirname
+                );
+                return;
+            }
         }
 
@@ -361 +350 @@
                 $self->{Oarchive}->error,
             );
+            return;
         }
         
@@ -369 +359 @@
         );
     }
+
+    $self->{status}->newval(
+        $self->{archivefile},
+        "data_processtime_$self->{datafile}",
+        $ltime
+    );
+    $self->{status}->newval(
+        $self->{archivefile},
+        "data_processversion_$self->{datafile}",
+        $ObsData::VERSION
+    );
+
+    $self->{status}->SetParameterComment(
+        $self->{archivefile}, 
+        "data_processtime_$self->{datafile}",
+        scalar(localtime($ltime)) . ", $ObsData::VERSION: $ObsData::CVSREV, $ObsData::Repository::CVSREV",
+    );
 }
 

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 2;
+use Test::More tests => 1;
 
 use_ok('ObsData::Repository');
 
-ok(!ObsData::Repository->new(1), "Return an error on bad file");

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

@@ -9 +9 @@
 
 my $o = ObsData->new('testdata/obsdata-conftest', logfile => "testdata/obsdata.log");
-my $or = ObsData::Repository->new(
+my $or = ObsData::Repository::dir->new(
     $o,
     "testdata",