Quick test includes Record::OPAC rather than Record::Fetch

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Test / Record / Fetch.pm

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index b6ff9b4..92d25a0 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -12,7 +12,6 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 
 our $max_timeout_errors = $ZOOM::IRSpy::max_timeout_errors;
 
-# These queries 
 my @queries = (
               "\@attr 1=4 mineral",
               "\@attr 1=4 computer",
@@ -26,9 +25,6 @@ sub start {
     my $class = shift();
     my($conn) = @_;
 
-    # Here I want to get a use attribute from the session, which we've
-    # managed to search for in the Search/Bib1 or Search/Dan1 tests.
-    # But how?  So far we search for title: 1=4
     $conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
                            ZOOM::Event::ZEND, \&completed_search,
                            exception => \&completed_search);
@@ -57,16 +53,12 @@ sub completed_search {
        my $qindex = $udata->{queryindex}+1;
        my $q = $queries[$qindex];
        return ZOOM::IRSpy::Status::TEST_SKIPPED
-           if !defined $q;
+           if !defined $q || $conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors;
 
-       if ($conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors) {
-           $conn->log("irspy_test", "Got $max_timeout_errors timeouts, give up...");
-        } else {
-           $conn->log("irspy_test", "Trying another search ...");
-           $conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+       $conn->log("irspy_test", "Trying another search ...");
+       $conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
                                ZOOM::Event::ZEND, \&completed_search,
                                exception => \&completed_search);
-       }
        return ZOOM::IRSpy::Status::TASK_DONE;
     }
 
@@ -80,7 +72,7 @@ sub completed_search {
                    'librismarc',
                    'mab',
                    'normarc',
-#                   'opac',
+                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',