Changeset 287 for obsdata/trunk

Timestamp:

11/11/06 22:21:54 (18 years ago)

Author:

nanardon

Message:

• make filename match case unsensitive
• extract file from archive to be able to perform stat() on it
• return annee2 aka year on 2 digit

Location:

obsdata/trunk/ourplugins

Files:

• cr_radiosondage_tvd.pl (modified) (2 diffs)
• ddu_trans.pl (modified) (3 diffs)

obsdata/trunk/ourplugins/cr_radiosondage_tvd.pl

@@ -62 +62 @@
     my ($rda, $plugintype, $datafile, $datatype) = @_;
 
-    $datafile =~ /\d\d_\d{4}\.ret$/ or return;
+    $datafile =~ /\d\d_\d{4}\.ret$/i or return;
 
     my $archive = $rda->archive() or do {
@@ -71 +71 @@
     };
 
-    my $filename = $archive->extract() or do {
+    my $filename = $archive->extract($datafile) or do {
         $rda->logging(4,
             "Can't get temporary file: %s",

obsdata/trunk/ourplugins/ddu_trans.pl

@@ -5 +5 @@
 use strict;
 
+sub ext_ar {
+    my ($rda, $datafile) = @_;
+    my $archive = $rda->archive() or do {
+        $rda->logging(4,
+            'Can get archive'
+        );
+        return();
+    };
+
+   my $filename = $archive->extract($datafile) or do {
+        $rda->logging(4,
+            "Can't get temporary  %s",
+            $archive->error || "",
+        );
+
+        return();
+    };
+    
+    $filename
+}
+
 sub {
     my ($rda, $plugintype, $datafile, $datatype) = @_;
 
+    my ($transidx) = $rda->archivefile() =~ /\.(\d+)$/;
 
-    if ($datafile =~ /bonjour\.txt$/) {
+    if ($datafile =~ /bonjour\.txt$/i) {
         # nothing specific to do
-    } elsif ($datafile =~ /trans(\d+).txt$/) {
+    } elsif ($datafile =~ /trans(\d+).txt$/i) {
         # nothing specific to do
-    } elsif ($datafile =~ /croz\d\d_\d.txt$/) {
-    } elsif ($datafile =~ /croz\d{4}.txt$/) {
-        if (open(my $h, '<', $datafile)) {
+    } elsif ($datafile =~ /croz\d\d_\d.txt$/i) {
+    } elsif ($datafile =~ /croz\d{4}.txt$/i) {
+        my $filename = ext_ar($rda, $datafile) or return(0);
+        if (open(my $h, '<', $filename)) {
             <$h>; # first line ignored
             my $line = <$h>;
@@ -26 +49 @@
                     minute => $7,
                 );
-                return (1, %date);
+                $date{'annee2'} = ($date{annee} =~ /(\d\d)$/)[0];
+                return (1, %date, transnum => $transidx);
+            }
+            else {
+                $rda->logging(0,
+                    "Line 1 doesn't match in %s (%s)",
+                    $filename || "", $datafile,
+                );          
             }
             close($h);
+            return(0);
+        } else {
+            $rda->logging(4,
+                "Can't open for read %s (%s)",
+                $filename || "", $datafile,
+            );                                    
+            return(0);
         }
-    } elsif ($datafile =~ /zo\d{4}$/) {
+    } elsif ($datafile =~ /zo\d{4}$/i) {
     } else {
         return(0);
     }
+
+    my $filename = ext_ar($rda, $datafile) or return(0);
     
-    my @stat = stat($datafile);
+    my @stat = stat($filename) or do {
+        $rda->logging(4,
+            "Can't stat %s (%s)",
+            $filename || "", $datafile,
+        );
+        return (0);
+    };
+
     my @d = gmtime($stat[9]);
     my %date = (
@@ -42 +88 @@
         jour  => $d[3],
     );
+    $date{'annee2'} = ($date{annee} =~ /(\d\d)$/)[0];
 
-    my ($transidx) = $rda->archivefile() =~ /\.(\d+)$/;
     return(1, %date, transnum => $transidx)
 }