Changeset 49

Timestamp:

11/24/05 07:19:51 (19 years ago)

Author:

thauvin

Message:

• add matching functions

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

@@ -246 +246 @@
 }
 
+sub match_data_type {
+    my ($self, $datatype, $label) = @_;
+    my $regexp = $self->getvalue($datatype, 'match') or return;
+    if (! ($label =~ /$regexp/)) {
+        return;
+    }
+    return 1;
+}
+
+sub find_match_data_type {
+    my ($self, $label) = @_;
+    foreach my $datatype ($self->list_datatype) {
+        if ($self->match_data_type($datatype, $label)) {
+            return $datatype;
+        }
+    }
+}
+
 sub find_file_obs {
     my ($self, $obs) = @_;

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 16;
+use Test::More tests => 20;
 use File::Temp qw(tempdir);
 
@@ -35 +35 @@
 print STDERR join(" ", $o->list_datatype);
 
+# Testing match rules
+ok($o->match_data_type('ozone', 'ozone12.gz'), "String matching setting");
+ok(!$o->match_data_type('ozone', 'foo12.gz'), "String no matching setting");
+
+ok($o->find_match_data_type('ozone12.gz'), "is able to find good datatype");
+ok(!$o->find_match_data_type('foo12.gz'), "is able to find good datatype");
+
+$o = undef; # Explicit destroy
 system("rm -fr $td"); 

trunk/soft/ObsData/testdata/obsdata-conftest

@@ -13 +13 @@
 
 [ozone]
+match= ^ozone\d\d\.gz$
 
 [oxygene]