Changeset 87

Timestamp:

12/01/05 15:22:59 (19 years ago)

Author:

thauvin

Message:

• start to make class independant

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (1 diff, 1 prop)
• ObsData/Repository.pm (modified) (8 diffs, 1 prop)
• t/OR-02.t (modified) (2 diffs, 1 prop)
• t/OR-03.t (added)
• testdata/ohp (added)
• testdata/ohp/ozone12.gz (added)
• testdata/ohp/ozone34.gz (added)

trunk/soft/ObsData/ObsData.pm

@@ -277 +277 @@
     foreach my $datatype (keys %datadir) {
         my $or = ObsData::Repository::dir->new(
-            $self,
-            $datadir{$datatype},
-            obs => $obs,
-            datatype => $datatype,
+            {
+                obsdata => $self,
+                dir => $datadir{$datatype},
+                obs => $obs,
+                datatype => $datatype,
+                statusfile => "$datadir{$datatype}/obsdata.ini"
+            }
         );
         if (!defined($or)) {

trunk/soft/ObsData/ObsData/Repository.pm

@@ -34 +34 @@
 
 sub new {
-    my ($class, $infos) = @_;
-
+    my ($class, $infos, %param) = @_;
+
+    my $or = { %$infos };
+    foreach (keys %param) {
+        $or->{$_} = $param{$_};
+    }
+    
     # $infos->
     # obsdata ObsData object
-    $infos->{obsdata} or die "Error #1de8d015, please insult programmer";
+    $or->{obsdata} or die "Error #1de8d015, please insult programmer";
     # datatype search directly fot it
     # obs station, informationnal only
+    # statusfile
     # status Config::IniFile object to store extraction info
     
-    bless($infos, $class);
+    $or->{status} ||= new Config::IniFiles(
+        -file => (($or->{statusfile} && -f $or->{statusfile}) ? $or->{statusfile} : undef),
+        # -default => '.', # Is this a good idea
+    );
+    
+    bless($or, $class);
 }
 
@@ -54 +65 @@
 sub save_status {
     my ($self) = @_;
+    $self->{statusfile} or return;
     $self->{status}->AddSection('.');
     $self->{status}->SetSectionComment('.',
@@ -61 +73 @@
     );
 
-    $self->{status}->WriteConfig("$self->{dir}/obsdata.ini");
+    $self->{status}->WriteConfig($self->{statusfile});
 }
 
@@ -83 +95 @@
 
 sub new {
-    my ($class, $obsdata, $dir, %info) = @_;
-
-    $obsdata or die "Error #1de8d015, please insult programmer";
-
-    $dir && -d $dir or return undef;
-
-    my $OR = {
-        obsdata => $obsdata,
-        status => new Config::IniFiles(
-            -file => (-f $dir . "/obsdata.ini" ? ($dir . "/obsdata.ini") : undef),
-            # -default => '.', # Is this a good idea
-        ),
-        dir => $dir,
-        do_if_change => {},
-    };
-    
-    foreach my $inf (qw(obs datatype)) {
-        $OR->{$inf} = $info{$inf};
-    }
-
-    bless($OR, $class);
+    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";
+
+    bless($or, $class);
+}
+
+sub findfile {
+    my ($self) = @_;
+    my @files;
+
+    if (!-d $self->{dir}) {
+        $self->loging(3,
+            "directory %s does not exists",
+            $self->{dir},
+        );
+        return;
+    }
+
+    my $patern = $self->{patern} || '*';
+    foreach my $f (glob("$self->{dir}/$patern")) {
+
+        -f $f or next; # skip no regular files
+        
+        my $bf = $f;
+        $bf =~ s!^\Q$self->{dir}\E/*!!;
+        push(@files, $bf);
+    }
+    @files
 }
 
@@ -109 +132 @@
     my ($self) = @_;
     $self->loging(0, "%s() start for %s", (caller(0))[3], $self->{dir});
-    if(opendir(my $dirhandle, $self->{dir})) {
-        while (my $file = readdir($dirhandle)) {
-            if ($file eq '..' || $file eq '.' ) { # Hope that's ok for everybody
-                next;
-            }
-
-            if (!-f "$self->{dir}/$file") {
-                next; # Not regular file, link are follow (stat)
-            }
-
-            if ($file eq 'obsdata.ini') {
-                next; # skipping status file
-            }
-
-            my $archive = ObsData::Repository::dir::archive->new(
-                $self,
-                $file
-            );
-            $archive->parse_archive;
-            # $self->install_file($file, $destfile);
-        }
-        close($dirhandle);
-    } else {
-        $self->loging(5, "can't open directory %s set for %s", $self->{dir}, $self->{obs});
+
+    foreach my $file ($self->findfile) {
+        my $orda = ObsData::Repository::dir::archive->new(
+            $self,
+            archivefile => $file,
+        );
+        $orda->parse_archive;
     }
 }
@@ -141 +147 @@
 
 sub new {
-    my ($class, $parent, $archivefile) = @_;
-    
-    my $ORa = { %$parent };
-
-    $ORa->{archivefile} = $archivefile;
-    $ORa->{changes} = {};
-    
-    bless($ORa, $class);
+    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";
+    $or->{archivefile} or die "No archivefile given";
+
+    bless($or, $class);
 }
 
@@ -260 +267 @@
         my $data = ObsData::Repository::dir::archive::data->new(
             $self,
-            $datafile,
+            datafile => $datafile,
         );
         $data->dispatch;
@@ -271 +278 @@
 
 sub new {
-    my ($class, $parent, $datafile) = @_;
-    
-    my $ORad = { %$parent };
-
-    $ORad->{datafile} = $datafile;
-    
-    bless($ORad, $class);
+    my ($class, $infos, %param) = @_;
+
+    my $or = ObsData::Repository->new($infos, %param);
+    # dir directory to parse
+    # patern glob() over file
+    $or->{datafile} or die "No datafile given";
+
+    bless($or, $class);
 }
 

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

@@ -3 +3 @@
 use Test::More tests => 4;
 use File::Temp qw(tempdir);
-use ObsData::Repository;
 
 use_ok('ObsData');
@@ -9 +8 @@
 
 my $o = ObsData->new('testdata/obsdata-conftest', logfile => "testdata/obsdata.log");
-my $or = ObsData::Repository::dir->new(
-    $o,
-    "testdata",
+my $or = ObsData::Repository->new(
+    { 
+        obsdata => $o,
+    }
 );