Changeset 195

Timestamp:

01/13/06 16:47:45 (18 years ago)

Author:

thauvin

Message:

• check also regexp 'match_archive'

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (1 diff, 1 prop)
• ObsData/Repository.pm (modified) (1 diff, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -153 +153 @@
         }
         foreach my $datatype ($self->list_datatype) {
-            my $regexp = $self->getvalue($datatype, 'match') or next; # next ? are we sure ?
-            eval { qr/$regexp/ }; # Many thanks Rafael
-            if ($@) {
-                $self->logging(4, "error in regexp for %s: '%s': %s",
-                    $datatype,
-                    $regexp,
-                    $@,
-                );
-                $result = 0;
-                # TODO set this reg unavalable
+            foreach my $var (qw(match match_archive)) {
+                my $regexp = $self->getvalue($datatype, $var) or next; # next ? are we sure ?
+                eval { qr/$regexp/ }; # Many thanks Rafael
+                if ($@) {
+                    $self->logging(4, "error in regexp for %s: '%s': %s",
+                        $datatype,
+                        $regexp,
+                        $@,
+                    );
+                    $result = 0;
+                    # TODO set this reg unavalable
+                }
             }
         }

trunk/soft/ObsData/ObsData/Repository.pm

@@ -583 +583 @@
     
     $val{'$datafile'} = $datafile;
+    $val{'$archivefile'} = $self->{archivefile};
     return ($datatype, sprintf(
         $dest,