Removing dublicated code.

diff --git a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
index fc1bf2c..a7d4a64 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
@@ -1,4 +1,4 @@
-# $Id: Bib1.pm,v 1.12 2006-10-25 10:49:51 mike Exp $
+# $Id: Bib1.pm,v 1.13 2006-10-26 10:24:20 sondberg Exp $

 
 # See the "Main" test package for documentation
 
 
 # See the "Main" test package for documentation
 

@@ -37,9 +37,7 @@ sub found {
 
     $conn->log("irspy_test", "search on access-point $attr found $n record",
               $n==1 ? "" : "s");
 
     $conn->log("irspy_test", "search on access-point $attr found $n record",
               $n==1 ? "" : "s");

-    $conn->record()->store_result('search', 'set'       => 'bib1',
-                                            'ap'        => $attr,
-                                            'ok'        => 1);
+    update($conn, $attr, 1);

 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }

@@ -51,10 +49,17 @@ sub error {
 
     $conn->log("irspy_test", "search on access-point $attr had error: ",
               $exception);
 
     $conn->log("irspy_test", "search on access-point $attr had error: ",
               $exception);

+    update($conn, $attr, 0);
+
+    return ZOOM::IRSpy::Status::TASK_DONE;
+}
+
+
+sub update {
+    my ($conn, $attr, $ok) = @_;

     $conn->record()->store_result('search', 'set'       => 'bib1',
                                             'ap'        => $attr,
     $conn->record()->store_result('search', 'set'       => 'bib1',
                                             'ap'        => $attr,

-                                            'ok'        => 0);
-    return ZOOM::IRSpy::Status::TASK_DONE;
+                                            'ok'        => $ok);

 }
 
 
 }
 
 

diff --git a/lib/ZOOM/IRSpy/Test/Search/Boolean.pm b/lib/ZOOM/IRSpy/Test/Search/Boolean.pm
index 5a60d23..c5d15c0 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Search/Boolean.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Boolean.pm
@@ -1,4 +1,4 @@
-# $Id: Boolean.pm,v 1.2 2006-10-25 11:25:36 sondberg Exp $
+# $Id: Boolean.pm,v 1.3 2006-10-26 10:24:20 sondberg Exp $

 
 # See the "Main" test package for documentation
 
 
 # See the "Main" test package for documentation
 

@@ -38,8 +38,7 @@ sub found {
 
     $conn->log("irspy_test", "search using boolean operator ", $operator,
                              " found $n record", $n==1 ? "" : "s");
 
     $conn->log("irspy_test", "search using boolean operator ", $operator,
                              " found $n record", $n==1 ? "" : "s");

-    $conn->record()->store_result('boolean', 'operator' => $operator,
-                                             'ok'       => 1);
+    update($conn, $operator, 1);

 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }

@@ -51,10 +50,17 @@ sub error {
 
     $conn->log("irspy_test", "search using boolean operator ", $operator,
                              " had error: ", $exception);
 
     $conn->log("irspy_test", "search using boolean operator ", $operator,
                              " had error: ", $exception);

-    $conn->record()->store_result('boolean', 'operator' => $operator,
-                                             'ok'       => 0);
+    update($conn, $operator, 0);

     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 

+sub update {
+    my ($conn, $operator, $ok) = @_;
+
+    $conn->record()->store_result('boolean', 'operator' => $operator,
+                                             'ok'       => $ok);
+}
+
+

 1;
 1;

diff --git a/lib/ZOOM/IRSpy/Test/Search/Dan1.pm b/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
index ddd12ef..9e344e6 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
@@ -1,4 +1,4 @@
-# $Id: Dan1.pm,v 1.3 2006-10-25 10:49:51 mike Exp $
+# $Id: Dan1.pm,v 1.4 2006-10-26 10:24:20 sondberg Exp $

 
 # See the "Main" test package for documentation
 
 
 # See the "Main" test package for documentation
 

@@ -34,9 +34,7 @@ sub found {
 
     $conn->log("irspy_test", "search on access-point $attr found $n record",
               $n==1 ? "" : "s");
 
     $conn->log("irspy_test", "search on access-point $attr found $n record",
               $n==1 ? "" : "s");

-    $conn->record()->store_result('search', 'set'       => 'dan1',
-                                            'ap'        => $attr,
-                                            'ok'        => 1);
+    update($conn, $attr, 1);

 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }

@@ -48,12 +46,21 @@ sub error {
 
     $conn->log("irspy_test", "search on access-point $attr had error: ",
               $exception);
 
     $conn->log("irspy_test", "search on access-point $attr had error: ",
               $exception);

-    $conn->record()->store_result('search', 'set'       => 'dan1',
-                                            'ap'        => $attr,
-                                            'ok'        => 0);
+    update($conn, $attr, 0);

 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 

+sub update {
+    my ($conn, $attr, $ok) = @_;
+
+    $conn->record()->store_result('search', 'set'       => 'dan1',
+                                            'ap'        => $attr,
+                                            'ok'        => $ok);
+}
+
+
+
+

 1;
 1;