Changeset 304

Timestamp:

12/05/06 17:02:11 (17 years ago)

Author:

nanardon

Message:

• split execution plugin code in its own function

File:

• obsdata/trunk/ObsData/Repository.pm (modified) (2 diffs)

obsdata/trunk/ObsData/Repository.pm

@@ -560 +560 @@
         # if regexp no match, @dataar is empty
         if (   @data
-            && ( @dataar         || !defined( $dataar[0] ) )
-            && ( (!defined($pret)) || $pret ) )
+            && ( @dataar             || !defined( $dataar[0] ) )
+            && ( ( !defined($pret) ) || $pret ) )
         {
             return ( $datatype, \@data, \@dataar, \%parg );
@@ -602 +602 @@
         $self->logging( 0, "Found plugin %s for %s, running it",
             'match_plugin', $datatype, );
-        my ( $exitstatus, @result ) =
-          $sub->( $self, 'match_plugin', $datafile, $datatype, @args, );
-        if ($exitstatus) {
-            if ( @result % 2 == 0 ) {
-                $self->logging( 0, "Plugin %s for %s exit with %s (%d values)",
-                    'match_plugin', $datatype, $exitstatus, scalar(@result), );
-                return ( 1, @result );
-            }
-            else {
-                $self->logging( 4, "Plugin %s for %s return impair values %d",
-                    $datatype, $exitstatus, scalar(@result), );
-                return undef;
-            }
-        }
-        else {
-            $self->logging( 0, "Plugin %s of %s exit with null, skipping",
-                'match_plugin', $datatype, );
-            return 0;
-        }
+
+        return $self->run_plugin( $sub, $datatype, $datafile, @args );
     }
     else {
         return undef;
+    }
+}
+
+=head3 run_plugin( $sub, $datatype, $datafile, @args )
+
+Run the plugin code for a datafile
+
+    $sub is the code ref
+    $datatype is type of data expect if any
+    $datafile is the filename in archive
+    @arg arbitrary information
+
+=cut
+
+sub run_plugin {
+    my ( $self, $sub, $datatype, $datafile, @args ) = @_;
+    my ( $exitstatus, @result ) =
+      $sub->( $self, 'match_plugin', $datafile, $datatype || "-", @args, );
+    if ($exitstatus) {
+        if ( @result % 2 == 0 ) {
+            $self->logging( 0, "Plugin %s for %s exit with %s (%d values)",
+                'match_plugin', $datatype, $exitstatus, scalar(@result), );
+            return ( 1, @result );
+        }
+        else {
+            $self->logging( 4, "Plugin %s for %s return impair values %d",
+                $datatype, $exitstatus, scalar(@result), );
+            return undef;
+        }
+    }
+    else {
+        $self->logging( 0, "Plugin %s of %s exit with null, skipping",
+            'match_plugin', $datatype, );
+        return 0;
     }
 }