Changeset 65

Timestamp:

11/28/05 19:15:07 (19 years ago)

Author:

thauvin

Message:

• add status for each data files

File:

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

trunk/soft/ObsData/ObsData/Repository.pm

@@ -91 +91 @@
             foreach my $content ($archive->ls) {
                 $self->loging(0, "archive %s: content %s", $file, $content);
-                my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename($content, $self->{datatype});
+
+                my $last_process = $self->{status}->val($file, "data_processtime_$content");
+                if ($last_process) {
+                    $self->loging(0, "%s/%s has been already processed at %s, skipping",
+                        $file,
+                        $content,
+                        scalar(localtime($last_process)),
+                    );
+                    next;
+                }
+                
+                my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename(
+                    $content, 
+                    $self->{datatype}
+                );
+                
                 $self->loging(0, "%s/%s file, datatype %s, destination %s",
                     $file, $content,
@@ -98 +113 @@
                 );
 
+                my $ltime = time;
+                $self->{status}->newval(
+                    $file,
+                    "data_processtime_$content",
+                    $ltime
+                );
+                $self->{status}->SetParameterComment(
+                    $file, 
+                    "data_processtime_$content",
+                    $ObsData::CVSID,
+                    $ObsData::Repository::CVSID,
+                    scalar(localtime($ltime)),
+                );
+
+                
                 if (!$datatype) {
                     $self->loging(3, "I don't know what to do of %s/%s", $file, $content);
@@ -104 +134 @@
                 } elsif ($destfile) {
                     $self->loging(0, "Extracting %s/%s to %s", $file, $content, $destfile);
-
+    
                     my ($dirname) = $destfile =~ m!(?:(.*)/)?(.*)$!; #! vim syntax
                     if ($dirname && ! -d $dirname) {
@@ -114 +144 @@
                     }
 
-                    $archive->extract($content, $destfile) or $self->loging(
-                        4, "Can't extract %s/%s to %s: %s",
-                        $file, $content, $destfile,
-                        $archive->error,
-                    );
+                    if ($archive->extract($content, $destfile)) {
+                        $self->{status}->newval($file, "data_type_$content", $datatype);
+                        $self->{status}->newval($file, "data_dest_$content", $destfile);
+                    } else {
+                        $self->loging(
+                            4, "Can't extract %s/%s to %s: %s",
+                            $file, $content, $destfile,
+                            $archive->error,
+                        );
+                    }
                     
                 } else {