Changeset 119

Timestamp:

12/12/05 22:33:16 (18 years ago)

Author:

thauvin

Message:

• allow to pass extra words, update tests

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -300 +300 @@
 }
 
-=head2 build_dest_filename($label, $datatype)
+=head2 build_dest_filename($label, $datatype, $magic_words)
 
 Build the destination file from original filename ($label) and optionnaly
@@ -312 +312 @@
 
 sub build_dest_filename {
-    my ($self, $label, $datatype) = @_;
+    my ($self, $label, $datatype, $magic_words) = @_;
     my @data;
     if ($datatype) {
@@ -329 +329 @@
             $val{$_} = shift(@data);
         }
+        foreach (keys %{$magic_words || {}}) {
+            $val{'$' . $_} = $magic_words->{$_};
+        }
+        $val{'$datafile'} = $label;
         return ($datatype, sprintf(
             $dest,

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

@@ -62 +62 @@
     eq_array(
         [ $o->build_dest_filename('oxygene12', 'oxygene') ],
-        [ 'oxygene', strftime("%Y/dest12", gmtime) ]
+        [ 'oxygene', strftime("%Y/dest12/oxygene12", gmtime) ]
     ),
     "Can build dest string with datatype"

trunk/soft/ObsData/testdata/obsdata-conftest

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