Changeset 33 for trunk

Timestamp:

11/05/05 19:03:22 (19 years ago)

Author:

thauvin

Message:

• add list_datatype()

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -99 +99 @@
 sub is_obs {
     my ($self, $obs) = @_;
-    grep { $_ eq "Obs $obs" } $self->{config}->GroupMembers('Obs');
+    scalar(grep { $_ eq "Obs $obs" } $self->{config}->GroupMembers('Obs'));
 }
 
@@ -144 +144 @@
 }
 
+=head2 list_datatype
+
+Return a list of datatype handle by config
+
+=cut
+
+sub list_datatype {
+    my ($self) = @_;
+    grep { $_ ne 'global' }
+    grep { $_ !~ /^Obs\s+/ }
+    grep { !$self->is_obs($_) } $self->{config}->Sections;
+}
+
 1;

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

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 9;
+use Test::More tests => 12;
 
 use_ok('ObsData');
 
 ok(my $o = ObsData->new('testdata/obsdata-conftest'), "Can create object");
+ok($o->is_obs('ohp'), "Isobs works");
+ok(!$o->is_obs('ozone'), "Isobs works");
 ok($o->getvalue('ohp', 'description'), "can get value");
 
@@ -20 +22 @@
 ok(eq_set([ $o->list_typedatadir('ozone') ], [ 'testdata/ohp/ozone', 'testdata/ohp' ]) , 'Can list data directory');
 ok(eq_set([ $o->get_datadir('ohp', 'ozone') ], [ 'testdata/ohp/ozone', 'testdata/ohp' ]) , 'Can retrive data directory');
+ok(eq_set([ $o->list_datatype ], [ 'oxygene', 'ozone' ]), "can get data type");
+print STDERR join(" ", $o->list_datatype);