Changeset 62

Timestamp:

11/28/05 08:30:12 (19 years ago)

Author:

thauvin

Message:

• allow to use strftime format for destination
• fix test

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -285 +285 @@
         my @matcharg = split(/\s+/, $self->getvalue($datatype, 'matcharg'));
         my @destarg = split(/\s+/, $self->getvalue($datatype, 'destarg'));
-        my %val;
+        my @gmtime = gmtime;
+        my %val = map { '%' . $_ => strftime('%' . $_, @gmtime) } 
+            qw(a A b B c C d D e F G g h H I j k l m M n p P r R s S T t T U V W w x X y Y z Z);
         foreach (@matcharg) {
             $val{$_} = shift(@data);

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 28;
+use Test::More tests => 29;
 use File::Temp qw(tempdir);
+use POSIX qw(strftime);
 
 use_ok('ObsData');
@@ -44 +45 @@
 
 # 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->match_data_type('ozone', 'ozone12'), "String matching setting");
+ok(!$o->match_data_type('ozone', 'foo12'), "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");
+ok($o->find_match_data_type('ozone12'), "is able to find good datatype");
+ok(!$o->find_match_data_type('foo12'), "is able to find good datatype");
 
 ok(
     eq_array( 
-        [ $o->build_dest_filename('ozone12.gz') ], 
-        [ 'ozone', 'dest12' ]
+        [ $o->build_dest_filename('ozone12') ], 
+        [ 'ozone', '12/dest12' ]
     ), 
     "Can build dest string"
@@ -59 +60 @@
 ok(
     eq_array(
-        [ $o->build_dest_filename('ozone12.gz', 'ozone') ],
-        [ 'ozone', 'dest12' ]
+        [ $o->build_dest_filename('ozone12', 'ozone') ],
+        [ 'ozone', '12/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");
+ok(
+    eq_array(
+        [ $o->build_dest_filename('oxygene12', 'oxygene') ],
+        [ 'oxygene', strftime("%Y/dest12", gmtime) ]
+    ),
+    "Can build dest string with datatype"
+);
+ok(!defined($o->build_dest_filename('foo12')), "Return undef if no match");
+ok(!defined($o->build_dest_filename('ozone12', 'oxygene')), "Return undef if no match");
 
 $o = undef; # Explicit destroy

trunk/soft/ObsData/testdata/obsdata-conftest

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