Changeset 95

Timestamp:

12/03/05 02:19:31 (19 years ago)

Author:

thauvin

Message:

• merge class

File:

• trunk/soft/ObsData/ObsData/Repository.pm (modified) (5 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -304 +304 @@
 # Sub data function:
 
+sub data_lastcheck {
+    my ($self, $datafile) = @_;
+    my $last_process = $self->{status}->val($self->{archivefile}, "data_processtime_$datafile");
+    if ($last_process) {
+        $self->loging(0, "%s/%s has been already processed at %s",
+            $self->{archivefile},
+            $datafile,
+            scalar(localtime($last_process)),
+        );
+    }
+    $last_process
+}
+
 sub get_data_dest {
     my ($self, $datafile) = @_;
@@ -328 +341 @@
     $self->load_archive or return 0;
     my $ltime = time;
-    
+
+    $self->{status}->newval(
+        $self->{archivefile},
+        "data_processtime_$datafile",
+        $ltime
+    );
+    $self->{status}->newval(
+        $self->{archivefile},
+        "data_processversion_$datafile",
+        $ObsData::VERSION
+    );
+
+    $self->{status}->SetParameterComment(
+        $self->{archivefile}, 
+        "data_processtime_$datafile",
+        scalar(localtime($ltime)) .
+        ", $ObsData::VERSION: $ObsData::CVSREV, $ObsData::Repository::CVSREV",
+    );
+   
     if (!$destfile) {
         $self->loging(3,
@@ -374 +405 @@
     }
 
-        $self->{status}->newval(
-        $self->{archivefile},
-        "data_processtime_$datafile",
-        $ltime
-    );
-    $self->{status}->newval(
-        $self->{archivefile},
-        "data_processversion_$datafile",
-        $ObsData::VERSION
-    );
-
-    $self->{status}->SetParameterComment(
-        $self->{archivefile}, 
-        "data_processtime_$datafile",
-        scalar(localtime($ltime)) .
-        ", $ObsData::VERSION: $ObsData::CVSREV, $ObsData::Repository::CVSREV",
-    );
-
     return 1;
 }
@@ -403 +416 @@
 
     foreach my $data ($self->list_archive) {
+        if ($self->data_lastcheck($data)) {
+            $self->loging(0,
+                "%s/%s has allready processed, skipping",
+                $self->{archivefile},
+                $data
+            );
+            next;
+        }
         $self->extract_data($data, $self->get_data_dest($data));
     }
@@ -411 +432 @@
 }
 
-package ObsData::Repository::dir::archive::data;
-
-our @ISA = qw(ObsData::Repository);
-
-sub new {
-    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);
-}
-
-#sub DESTROY {
-#    my ($self) = @_;
-#    $self->loging(0, "Destroy ObsData::Repository::archive for %s", ref($self));
-#    $self->SUPER::DESTROY();
-#}
-
-# TODO Define return code for this function, storing result somewhere to
-# pass to child.
-sub data_need_parse {
-    my ($self) = @_;
-    my $last_process = $self->{status}->val($self->{archivefile}, "data_processtime_$self->{datafile}");
-    if ($last_process) {
-        $self->loging(0, "%s/%s has been already processed at %s, skipping",
-            $self->{archivefile},
-            $self->{datafile},
-            scalar(localtime($last_process)),
-        );
-        return;
-    }
-    return 1;
-}
-
-sub dispatch {
-    my ($self) = @_;
-
-    $self->data_need_parse or return;
-    
-    my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename(
-        $self->{datafile}, 
-        $self->{datatype}
-    );
-    
-    $self->loging(0, "%s/%s file, datatype %s, destination %s",
-        $self->{archivefile},
-        $self->{datafile},
-        $datatype || '(none)',
-        $destfile || '(none)',
-    );
-
-    my $ltime = time;
-    
-    if (!$datatype) {
-        $self->loging(3,
-            "I don't know what to do of %s/%s",
-            $self->{archivefile},
-            $self->{datafile}
-        );
-    } elsif ($destfile) {
-        $self->loging(0,
-            "Extracting %s/%s to %s", $self->{archivefile},
-            $self->{datafile},
-            $destfile
-        );
-
-        my ($dirname) = $destfile =~ m!(?:(.*)/)?(.*)$!; #! vim syntax
-        if ($dirname && ! -d $dirname) {
-            $self->loging(0, "Creating directory %s", $dirname);
-            if( ! File::Path::mkpath($dirname)) { 
-                $self->loging(
-                    4, "Can't create directory %s", 
-                    $dirname
-                );
-                return;
-            }
-        }
-
-        if ($self->{Oarchive}->extract($self->{datafile}, $destfile)) {
-            $self->{status}->newval($self->{archivefile}, "data_type_$self->{datafile}", $datatype);
-            $self->{status}->newval($self->{archivefile}, "data_dest_$self->{datafile}", $destfile);
-            $self->loging(
-                1, "Extraction of %s/%s done as %s (%s)",
-                $self->{archivefile},
-                $self->{datafile},
-                $destfile,
-                $datatype
-            );
-                
-        } else {
-            $self->loging(
-                4, "Can't extract %s/%s to %s: %s",
-                $self->{archivefile}, $self->{datafile}, $destfile,
-                $self->{Oarchive}->error,
-            );
-            return;
-        }
-        
-    } else {
-        $self->loging(3,
-            "%s/%s has type %s but no destination",
-            $self->{archivefile}, $self->{datafile}, $datatype
-        );
-    }
-
-    $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",
-    );
-}
-
 1;