Changeset 52

Timestamp:

11/24/05 18:27:30 (19 years ago)

Author:

thauvin

Message:

• add function to generate dest string

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (1 diff, 1 prop)
• t/O-02.t (modified) (2 diffs, 1 prop)
• testdata/obsdata-conftest (modified) (1 diff, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -266 +266 @@
 }
 
+sub build_dest_filename {
+    my ($self, $label, $datatype) = @_;
+    my @data;
+    if ($datatype) {
+        @data = $self->match_data_type($datatype, $label);
+    } else {
+        ($datatype, @data) = $self->find_match_data_type($label);
+    }
+
+    if ($datatype && @data) {
+        my $dest = $self->getvalue($datatype, 'dest');
+        my @matcharg = split(/\s+/, $self->getvalue($datatype, 'matcharg'));
+        my @destarg = split(/\s+/, $self->getvalue($datatype, 'destarg'));
+        my %val;
+        foreach (@matcharg) {
+            $val{$_} = shift(@data);
+        }
+        return sprintf(
+            $dest,
+            map { $val{$_} } @destarg,
+        );
+    }
+    undef;
+}
+
 sub find_file_obs {
     my ($self, $obs) = @_;

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 20;
+use Test::More tests => 24;
 use File::Temp qw(tempdir);
 
@@ -42 +42 @@
 ok(!$o->find_match_data_type('foo12.gz'), "is able to find good datatype");
 
+ok($o->build_dest_filename('ozone12.gz') eq 'dest12', "Can build dest string");
+ok($o->build_dest_filename('ozone12.gz', 'ozone') eq 'dest12', "Can build dest string with datatype");
+ok(!defined($o->build_dest_filename('foo12.gz')), "Return undef if no match");
+ok(!defined($o->build_dest_filename('ozone12.gz', 'oxygene')), "Return undef if no match");
+
 $o = undef; # Explicit destroy
 system("rm -fr $td"); 

trunk/soft/ObsData/testdata/obsdata-conftest

@@ -13 +13 @@
 
 [ozone]
-match= ^ozone\d\d\.gz$
+match= ^ozone(\d\d)\.gz$
+matcharg=num
+destarg=num
+dest=dest%s
 
 [oxygene]