Changeset 300 for obsdata/tags/0.3.2

Timestamp:

11/16/06 00:47:53 (18 years ago)

Author:

nanardon

Message:

• backport last fix

Location:

obsdata/tags/0.3.2

Files:

• ObsData/Repository.pm (modified) (1 diff)
• ourplugins/cr_radiosondage_tvd.pl (modified) (2 diffs)
• ourplugins/ddu_trans.pl (modified) (2 diffs)

obsdata/tags/0.3.2/ObsData/Repository.pm

@@ -561 +561 @@
         if (   @data
             && ( @dataar         || !defined( $dataar[0] ) )
-            && ( !defined($pret) || $pret ) )
+            && ( (!defined($pret)) || $pret ) )
         {
             return ( $datatype, \@data, \@dataar, \%parg );
         }
     }
+    return;
 }
 

obsdata/tags/0.3.2/ourplugins/cr_radiosondage_tvd.pl

@@ -96 +96 @@
     # just search line begining by 'a' ?
     while (my $line = <$handle>) {
-        /^a / or next;
+        $line =~ /^a / or next;
         chomp($line);
         my @val = split(/\s+/, $line);
@@ -108 +108 @@
     }
 
+    $rda->logging(0, "EOF of %s reached w/o having found date/time line", $datafile );
     close($handle);
 

obsdata/tags/0.3.2/ourplugins/ddu_trans.pl

@@ -43 +43 @@
             if ($line =~ /^(\x1B)(8) {63}([ \d]{2})-([ \d]{2})-([ \d]{2})  ([ \d]{2}):([ \d]{2})/) {
                 my %date = (
-                    annee => $5,
+                    annee => $5 + ($5 < 70 ? 2000 : 1900),
+                    annee2 => $5,
                     jour => $3,
                     mois => $4,
@@ -49 +50 @@
                     minute => $7,
                 );
-                $date{'annee2'} = ($date{annee} =~ /(\d\d)$/)[0];
                 return (1, %date, transnum => $transidx);
             }