Changeset 272 for obsdata

Timestamp:

10/27/06 00:22:20 (18 years ago)

Author:

nanardon

Message:

• add unproccessed files in mail report
• add a specific parameter in config to send those files to specific people

Location:

obsdata/trunk

Files:

• ObsData.pm (modified) (5 diffs)
• ObsData/Repository.pm (modified) (1 diff)

obsdata/trunk/ObsData.pm

@@ -461 +461 @@
         $datafile,
         $dest,
-    );
+    ) if ($dest);
 }
 
@@ -473 +473 @@
     foreach my $entry (@{$self->{processed_lists}}) {
         my %people = map { $_ => 1 } grep { $_ } (
-            split(/\s*,\s*/, $self->getvalue($entry->{datatype}, 'reportto') || ""),
+            ($entry->{datatype} ?
+                split(/\s*,\s*/, $self->getvalue($entry->{datatype}, 'reportto') || "") :
+                split(/\s*,\s*/, $self->getvalue('global', 'nodestreportto') || "")
+            ),
             split(/\s*,\s*/, $self->getvalue($entry->{obs}, 'reportto') || ""),
             split(/\s*,\s*/, $self->getvalue('global', 'allreportto') || "")
@@ -492 +495 @@
             my %datatype_entries = ();
             foreach (@{$obs_entries{$obs}}) {
-                push(@{$datatype_entries{$_->{datatype}}}, $_);
-            }
-    
+                push(@{$datatype_entries{$_->{datatype} || '!'}}, $_);
+            }
 
             my %msg = (
@@ -502 +504 @@
                 'Content-Type' => "TEXT/PLAIN;\n  charset=ISO-8859-1",
                 'Content-Transfer-Encoding' => 'QUOTED-PRINTABLE',
-                From => 'ObsData <robot@aerov.jussieu.fr>',
+                From => 'ObsData <robot@aero.jussieu.fr>',
             );
             my $message = "";
-            foreach my $d (keys(%datatype_entries)) {
-                $message .= "\nDataType: $d\n";
-                foreach (@{$datatype_entries{$d} || []}) {
-                    $message .= sprintf("  file %s from %s => %s\n",
-                        $_->{datafile},
-                        $_->{archive},
-                        $_->{destfile},
-                    );
+            foreach my $d (sort keys(%datatype_entries)) {
+                if ($d eq '!') {
+                    $message .= "\nNot proceed:\n";
+                    foreach (@{$datatype_entries{$d} || []}) {
+                        $message .= sprintf("  file %s from %s\n",
+                            $_->{datafile},
+                            $_->{archive},
+                        );
+                    }
+                } else {
+                    $message .= "\nDataType: $d\n";
+                    foreach (@{$datatype_entries{$d} || []}) {
+                        $message .= sprintf("  file %s from %s => %s\n",
+                            $_->{datafile},
+                            $_->{archive},
+                            $_->{destfile},
+                        );
+                    }
                 }
             }
@@ -531 +543 @@
     my %datastype;
     foreach my $entry (@{$self->{processed_lists}}) {
+        $entry->{datatype} or next;
         push(@{$datastype{$entry->{datatype}}}, $entry);
     }

obsdata/trunk/ObsData/Repository.pm

@@ -785 +785 @@
             $self->{archivefile}, $datafile,
         );
+        $self->{obsdata}->processed(
+            $self->{obs},
+            $self->{archivefile},
+            $datafile,
+        );
         return 0;
     }