Changeset 246

Timestamp:

05/04/06 18:52:09 (18 years ago)

Author:

nanardon

Message:

• run all test to see if a data match rules, not only the regexp on datafile, then ensure all rules are processed before saying a file has no destination

File:

• trunk/soft/ObsData/ObsData/Repository.pm (modified) (6 diffs)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -550 +550 @@
         my $regexp = $self->{obsdata}->getvalue($datatype, 'match') or next;
         my @data = $datafile =~ /$regexp/;
-        if (@data) {
-            return ($datatype, @data);
+        my @dataar = $self->archive_match($datatype);
+        my ($pret, %parg) = $self->get_info_from_plugin($datatype, $datafile);
+        # if no regexp => return undef
+        # if regexp and match, @dataar contain something
+        # if regexp no match, @dataar is empty 
+        if (@data && (@dataar || !defined($dataar[0])) && (!defined($pret) || $pret)) {
+            return ($datatype, \@data, \@dataar);
         }
     }
@@ -564 +569 @@
 sub archive_match {
     my ($self, $datatype) = @_;
-    my $regexp = $self->{obsdata}->getvalue($datatype, 'match_archive') or next;
+    my $regexp = $self->{obsdata}->getvalue($datatype, 'match_archive') or return undef;
     my @data = $self->{archivefile} =~ /$regexp/;
     return @data;
 }
 
-=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) = @_;
-    my ($datatype, @data) = $self->match_data_type($datafile);
-    
-    if (! $datatype) {
-        return;
-    }
-
-    my @ardata = ();
-    if (my $arregexp = $self->{obsdata}->getvalue($datatype, 'match_archive')) {
-        @ardata = $self->{archivefile} =~ /$arregexp/;
-        if (!@ardata) {
-            return; # FIXME is this what we want ?
-        }
-    }
-
+=head3 get_info_from_plugin($datatype, $datafile)
+
+First arg is:
+  undef if no plugin
+  0 no match
+  1 match, %list follow
+
+=cut
+
+sub get_info_from_plugin {
+    my ($self, $datatype, $datafile) = @_;
+    
     my %val;
     
@@ -624 +614 @@
                     scalar(@result),
                 );
-                %val = @result;
+                return(1, @result);
             } else {
                 $self->logging(4,
@@ -632 +622 @@
                     scalar(@result),
                 );
-                return;
+                return undef;
             }
         } else {
@@ -640 +630 @@
                 $datatype,
             );
-            return;
+            return 0;
         }
-    }
-    
+    } else {
+        return undef;
+    }
+}
+
+=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) = @_;
+    my ($datatype, $data, $dataar, $parg) = $self->match_data_type($datafile);
+    
+    if (! $datatype) {
+        return;
+    }
+
+    my %val = %{$parg || {}};
+
     my $dest = $self->{obsdata}->getvalue($datatype, 'dest');
     my @matcharg = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'matcharg') || '');
@@ -651 +665 @@
 
     foreach (@matcharg) {
-        $val{$_} = shift(@data);
+        $val{$_} = shift(@$data);
     }
     foreach (@matcharg_ar) {
-        $val{$_} = shift(@ardata);
+        $val{$_} = shift(@$dataar);
     }
     # FIXME Is this need ?