Changeset 51

Timestamp:

11/24/05 11:39:30 (19 years ago)

Author:

thauvin

Message:

• match* function return data from regexp

File:

• trunk/soft/ObsData/ObsData.pm (modified) (2 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -249 +249 @@
     my ($self, $datatype, $label) = @_;
     my $regexp = $self->getvalue($datatype, 'match') or return;
-    if (! ($label =~ /$regexp/)) {
+    my @data = $label =~ /$regexp/;
+    if (! @data) {
         return;
     }
-    return 1;
+    return @data;
 }
 
@@ -258 +259 @@
     my ($self, $label) = @_;
     foreach my $datatype ($self->list_datatype) {
-        if ($self->match_data_type($datatype, $label)) {
-            return $datatype;
+        my @data = $self->match_data_type($datatype, $label);
+        if (@data) {
+            return($datatype, @data);
         }
     }