Changeset 194

Timestamp:

01/13/06 16:22:00 (18 years ago)

Author:

thauvin

Message:

• add a way to get information from archive file (instead data file)

Location:

trunk/soft/ObsData

Files:

• ObsData/Repository.pm (modified) (3 diffs, 1 prop)
• testdata/obsdata-conftest (modified) (1 diff, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -525 +525 @@
 }
 
+=head3 archive_match($datatype)
+
+Apply matching to archive filename
+
+=cut
+
+sub archive_match {
+    my ($self, $datatype) = @_;
+    my $regexp = $self->{obsdata}->getvalue($datatype, 'match_archive') or next;
+    my @data = $self->{archivefile} =~ /$regexp/;
+    return @data;
+}
+
 =head3 build_dest_filename($datafile)
 
@@ -536 +549 @@
 =cut
 
-
 sub build_dest_filename {
     my ($self, $datafile) = @_;
     my ($datatype, @data) = $self->match_data_type($datafile);
-
+    
     if (! $datatype) {
         return;
     }
 
+    my @ardata = ();
+    if (my $arregexp = $self->{obsdata}->getvalue($datatype, 'match_archive')) {
+        @ardata = $self->{archivefile} =~ /$arregexp/;
+        if (!@ardata) {
+            return; # FIXME is this what we want ?
+        }
+    }
+
     my $dest = $self->{obsdata}->getvalue($datatype, 'dest');
     my @matcharg = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'matcharg'));
+    my @matcharg_ar = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'matcharg_archive')||"");
     my @destarg = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'destarg'));
     my @gmtime = gmtime;
@@ -552 +573 @@
     foreach (@matcharg) {
         $val{$_} = shift(@data);
+    }
+    foreach (@matcharg_ar) {
+        $val{$_} = shift(@ardata);
     }
     # FIXME Is this need ?

trunk/soft/ObsData/testdata/obsdata-conftest

@@ -19 +19 @@
 
 [oxygene]
+match_archive= ^[^\d]*(\d\d)
+matcharg_archive= arnum
 match= ^oxygene(\d\d)$
 matcharg=num
-destarg=%Y num $datafile
+destarg=%Y arnum $datafile
 dest=%s/dest%s/%s