Changeset 327 for obsdata

Timestamp:

03/24/09 16:51:24 (15 years ago)

Author:

thetis

Message:

325 to 326 pour branche tags

Location:

obsdata

Files:

• tags/0.3.2/ourplugins/cr_lid_strato.pl (modified) (3 diffs)
• trunk/ourplugins/cr_lid_strato.pl (modified) (1 diff)

obsdata/tags/0.3.2/ourplugins/cr_lid_strato.pl

@@ -1 +1 @@
 #!/usr/bin/perl -c
 
-# $Id: cr_lid_strato.pl 248 2008-06-30 17:51:14Z thetis $
+# $Id: sho_lid.pl 324 2009-03-24 15:34:20Z thetis $
 
 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) = @_;
 
-        $datafile =~ /sho/ or return(0);
-        my $archive = $rda->archive() or do {
-            $rda->logging(4,
-                'Can get archive'
-            );
-            return(0);
-     };
+#       $datafile =~ /sho/ or return(0);
+#       my $archive = $rda->archive() or do {
+#            $rda->logging(4,
+#                'Can get archive'
+#            );
+#           return(0);
+#    };     
 
-    my $filename = $archive->extract() or do {
-        $rda->logging(4,
-            "Can't get temporary  %s",
-            $archive->error || "",
-            );
-            return(0);
-    };
+        my $filename = ext_ar($rda, $datafile) or return(0);
 
     my $resopen = open(my $h, $filename);
@@ -34 +49 @@
         );
         return(0);
-     }
+        }
 
         while(my $line = <$h>) {
             chomp($line);
-#           print "$line\n";
             if ($line =~ /^ sho/) {
                 my $nextline = <$h>;
@@ -45 +59 @@
                 my ($jour,$mois,$annee,$hd,$md,$sd,$hf,$mf)=
                 $nextline =~ /OHP      (\d\d)\/(\d\d)\/\d\d(\d\d) (\d\d):(\d\d):(\d\d) (\d\d):(\d\d):\d\d/;
-#               $nextline =~ /(\d\d):(\d\d):(\d\d) (\d\d):(\d\d):\d\d/;
-#               if ($hd$md$sd) {
                 if ($1) {
                         print "$hd$md$sd\n";
                    return (1, 'jour' => "$jour", 'mois' => "$mois", 'annee' => "$annee", 'dheure' => "$hd$md$sd");
-#                  return (1, 'dheure', $hd.$md.$sd);
                 } else {
                   $rda->logging(4,

obsdata/trunk/ourplugins/cr_lid_strato.pl

@@ -1 +1 @@
 #!/usr/bin/perl -c
 
-# $Id: sho_lid.pl 324 2009-03-24 15:34:20Z thetis $
+# $Id: cr_lid_strato.pl 324 2009-03-24 15:34:20Z thetis $
 
 use strict;