Changeset 92

Timestamp:

12/02/05 14:13:48 (19 years ago)

Author:

thauvin

Message:

• add function for data file

Location:

trunk/soft/ObsData

Files:

• ObsData/Repository.pm (modified) (2 diffs, 1 prop)
• t/OR-03.t (modified) (2 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -274 +274 @@
 }
 
-sub update_status {
-    my ($self) = @_;
-    my @filestats = stat("$self->{dir}/$self->{archivefile}");
-    if (!$self->{status}->SectionExists($self->{archivefile})) {
-        $self->{status}->AddSection($self->{archivefile});
-    }
-    $self->{status}->newval($self->{archivefile}, 'mtime', $filestats[9]);
-    $self->{status}->newval($self->{archivefile}, 'size', $filestats[7]);
-
-    $self->{status}->newval($self->{archivefile}, 'configtime', $self->{obsdata}->config_mtime);
-}
-
 sub parse_archive {
     my ($self) = @_;
@@ -299 +287 @@
         $data->dispatch;
     }
+    return 1;
+}
+
+sub update_status {
+    my ($self) = @_;
+    my @filestats = stat("$self->{dir}/$self->{archivefile}");
+    if (!$self->{status}->SectionExists($self->{archivefile})) {
+        $self->{status}->AddSection($self->{archivefile});
+    }
+    $self->{status}->newval($self->{archivefile}, 'mtime', $filestats[9]);
+    $self->{status}->newval($self->{archivefile}, 'size', $filestats[7]);
+
+    $self->{status}->newval($self->{archivefile}, 'configtime', $self->{obsdata}->config_mtime);
+}
+
+# Sub data function:
+
+sub get_data_dest {
+    my ($self, $datafile) = @_;
+
+    my ($t, $d) = $self->{obsdata}->build_dest_filename(
+        $datafile,
+        $self->{datatype}
+    );
+    $self->loging(0, "%s/%s file, datatype %s, destination %s",
+        $self->{archivefile},
+        $self->{datafile},
+        $t || '(none)',
+        $d || '(none)',
+    );
+    if ($t) {
+        $self->{status}->newval($self->{archivefile}, "data_type_$datafile", $t);
+    }
+    return($t, $d);
+}
+
+sub extract_data {
+    # $datatype, informationnal only here
+    my ($self, $datafile, $datatype, $destfile) = @_;
+    $self->load_archive or return 0;
+    my $ltime = time;
+    
+    if (!$destfile) {
+        $self->loging(3,
+            "%s/%s has no destination",
+            $self->{archivefile}, $datafile,
+        );
+        return 0;
+    }
+    
+    $self->loging(0,
+        "Trying to extract %s from %s/%s",
+        $destfile,
+        $self->{archivefile}, $datafile
+    );
+
+    my ($dirname) = $destfile =~ m!(?:(.*)/)?(.*)$!; #! vim syntax sux
+    
+    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 0;
+        }
+    }
+
+    if ($self->{Oarchive}->extract($datafile, $destfile)) {
+        $self->{status}->newval($self->{archivefile}, "data_dest_$datafile", $destfile);
+        $self->loging(
+            1, "Extraction of %s/%s done as %s",
+            $self->{archivefile},
+            $datafile,
+            $destfile,
+        );
+            
+    } else {
+        $self->loging(
+            4, "Can't extract %s/%s to %s: %s",
+            $self->{archivefile}, $datafile, $destfile,
+            $self->{Oarchive}->error,
+        );
+        return 0;
+    }
+
+        $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;
 }

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 9;
+use Test::More tests => 11;
 use File::Temp qw(tempdir);
 
@@ -33 +33 @@
     ok($or->load_archive, "Can load an archive");
     ok($or->list_archive, "Can list archive content");
+    ok($or->get_data_dest('ozone34'), "Can get data destination");
+    ok($or->extract_data('ozone34', undef, '/dev/null'), "Can extract data");
 }