X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=754d3fa0908ad18605bd3feb33b403da1f708bb3;hb=1722445073349b59388d81952fff2334b6cbbf96;hp=ee29f08572ed1cdbb67f7f4afaea098e15ca30e2;hpb=e8903e9abe99e33dfa6b7a8943c3c1b97b7dab21;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index ee29f08..754d3fa 100644
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -1,4 +1,4 @@
-# $Id: Fetch.pm,v 1.1 2006-10-23 13:54:52 sondberg Exp $
+# $Id: Fetch.pm,v 1.6 2006-10-25 11:44:35 sondberg Exp $
 
 # See the "Main" test package for documentation
 
@@ -13,11 +13,10 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 
 
 sub start {
-    print STDERR "Got here\n";
-    exit 1;
     my $class = shift();
     my($conn) = @_;
-    my @syntax = ( 'canmarc',
+    my @syntax = (
+                   'canmarc',
                    'danmarc',
                    'grs-1',
                    'ibermarc',
@@ -31,23 +30,21 @@ sub start {
                    'rusmarc',
                    'summary',
                    'sutrs',
-                   'swemarc'
+                   'swemarc',
                    'ukmarc',
                    'unimarc',
                    'usmarc',
-                   'xml',
+                   'xml'
                 );
 
     foreach my $syn (@syntax) {
-        $conn->option('preferredRecordSyntax' => $syn);
-        $conn->option('start'   => 0);
-        $conn->option('count'   => 1);
-
         ## 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("\@attr 1=4 mineral",
                                 {'syntax' => $syn},
+				{ start => 0, count => 1,
+				  preferredRecordSyntax => $syn },
                                 ZOOM::Event::RECV_RECORD, \&record,
 				exception => \&error);
     }
@@ -56,10 +53,16 @@ sub start {
 
 sub record {
     my($conn, $task, $test_args, $event) = @_;
-    my $syn = $test_args->{'syn'};
+    my $syn = $test_args->{'syntax'};
+    my $rs = $task->{rs};
+
+    if (1) {
+        print STDERR "Hits: ", $rs->size(), "\n";
+        print STDERR "Syntax: ", $syn, "\n";
+        print STDERR $rs->record(0)->render();
+    }
 
-    $conn->log("irspy_test", "search on access-point $attr found $n record",
-	       $n==1 ? "" : "s");
+    $conn->log("irspy_test", "Successfully retrieved a $syn record");
     $conn->record()->store_result('record_fetch',
                                   'syntax'   => $syn,
                                   'ok'       => 1);
@@ -70,10 +73,9 @@ sub record {
 
 sub error {
     my($conn, $task, $test_args, $exception) = @_;
-    my $syn = $test_args->{'syn'};
+    my $syn = $test_args->{'syntax'};
 
-    $conn->log("irspy_test", "search on access-point $attr had error: ",
-	       $exception);
+    $conn->log("irspy_test", "Retrieval of $syn record failed: ", $exception);
     $conn->record()->store_result('record_fetch',
                                   'syntax'       => $syn,
                                   'ok'        => 0);