Changeset 193

Timestamp:

01/13/06 15:08:27 (18 years ago)

Author:

thauvin

Message:

• delete obsoleted functions

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (1 diff, 1 prop)
• ObsData/Repository.pm (modified) (3 diffs, 1 prop)
• t/O-02.t (modified) (2 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -268 +268 @@
     grep { $_ !~ /^Obs\s+/ }
     grep { !$self->is_obs($_) } $self->{config}->Sections;
-}
-
-=head2 match_data_type($datatype, $label)
-
-Check if $label match the regexp associate to $datatype, return match values
-or nothing if no match.
-
-=cut
-
-sub match_data_type {
-    my ($self, $datatype, $label) = @_;
-    my $regexp = $self->getvalue($datatype, 'match') or return;
-    my @data = $label =~ /$regexp/;
-    if (! @data) {
-        return;
-    }
-    return @data;
-}
-
-=head2 find_match_data_type($label)
-
-Check if $label match one of the regexp associate to datatype in the
-configuration, if yes, return the datatype and assiociate values, else
-return nothing
-
-=cut
-
-sub find_match_data_type {
-    my ($self, $label) = @_;
-    foreach my $datatype ($self->list_datatype) {
-        my @data = $self->match_data_type($datatype, $label);
-        if (@data) {
-            return($datatype, @data);
-        }
-    }
-}
-
-=head2 build_dest_filename($label, $datatype, $magic_words)
-
-Build the destination file from original filename ($label) and optionnaly
-from $datatype. Return the datatype and the filename. If no datatype apply,
-return undef, if destination file cannot be build, return only the datatype.
-
-If $datatype is not defined, the function try to find the right datatype from
-configuration.
-
-=cut
-
-sub build_dest_filename {
-    my ($self, $label, $datatype, $magic_words) = @_;
-    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 @gmtime = gmtime;
-        my %val;
-        foreach (@matcharg) {
-            $val{$_} = shift(@data);
-        }
-        foreach (keys %{$magic_words || {}}) {
-            $val{'$' . $_} = $magic_words->{$_};
-        }
-        $val{'$datafile'} = $label;
-        return ($datatype, sprintf(
-            $dest,
-            map { m/^%/ ? strftime($_, @gmtime) : $val{$_} } @destarg,
-        ));
-    }
-    undef;
 }
 

trunk/soft/ObsData/ObsData/Repository.pm

@@ -506 +506 @@
 }
 
+=head3 find_match_data_type($label)
+
+Check if datafile match one of the regexp associate to datatype in the
+configuration, if yes, return the datatype and assiociate values, else
+return nothing
+
+=cut
+
 sub match_data_type {
     my ($self, $datafile) =  @_;
@@ -517 +525 @@
 }
 
+=head3 build_dest_filename($datafile)
+
+Build the destination file from original filename and optionnaly.
+Return the datatype and the filename. If no datatype apply,
+return undef, if destination file cannot be build, return only the datatype.
+
+If object datatype is not defined, the function try to find the right datatype from
+configuration.
+
+=cut
+
+
 sub build_dest_filename {
     my ($self, $datafile) = @_;
@@ -556 +576 @@
     my ($self, $datafile) = @_;
 
-    my ($t, $d) = $self->{obsdata}->build_dest_filename(
+    my ($t, $d) = $self->build_dest_filename(
         $datafile,
         $self->{datatype}

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

@@ -4 +4 @@
 use warnings;
 
-use Test::More tests => 29;
+use Test::More tests => 20;
 use File::Temp qw(tempdir);
 use POSIX qw(strftime);
@@ -41 +41 @@
 print STDERR join(" ", $o->list_datatype);
 
-# Testing match rules
-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'), "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') ], 
-        [ 'ozone', '12/dest12' ]
-    ), 
-    "Can build dest string"
-);
-ok(
-    eq_array(
-        [ $o->build_dest_filename('ozone12', 'ozone') ],
-        [ 'ozone', '12/dest12' ]
-    ),
-    "Can build dest string with datatype"
-);
-ok(
-    eq_array(
-        [ $o->build_dest_filename('oxygene12', 'oxygene') ],
-        [ 'oxygene', strftime("%Y/dest12/oxygene12", 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