X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F25-scan.t;h=01aba9e01d83536e44b77d1f9f4b5cf5e5eb7ea8;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=c361fc4aa37826ef6a3f6ba0a0e4c46a796b9a98;hpb=020448731710e235062c5b439e1e0939c56c7b2d;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/25-scan.t b/t/25-scan.t
index c361fc4..01aba9e 100644
--- a/t/25-scan.t
+++ b/t/25-scan.t
@@ -1,5 +1,3 @@
-# $Id: 25-scan.t,v 1.3 2005-12-19 17:40:04 mike Exp $
-
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl 25-scan.t'
 
@@ -9,12 +7,13 @@ use Test::More tests => 81;
 
 BEGIN { use_ok('ZOOM') };
 
-my $host = "indexdata.com/gils";
+my $host = "z3950.indexdata.com/gils";
 my $conn;
 eval { $conn = new ZOOM::Connection($host, 0) };
 ok(!$@, "connection to '$host'");
 
-my($ss, $n) = scan($conn, "w", 10);
+$conn->option(number => 10);
+my($ss, $n) = scan($conn, 0, "w", 10);
 
 my @terms = ();
 
@@ -29,7 +28,8 @@ foreach my $i (1 .. $n) {
     (my $disp, $occ) = $ss->display_term($i-1);
     ok(defined $disp,
        "display term $i of $n: '$disp' ($occ occurences)");
-    ok($disp eq $term, "display term $i identical to term");
+    ok(lc($disp) eq lc($term),
+       "display term $i ($disp) equivalent to term ($term)");
 }
 
 $ss->destroy();
@@ -39,7 +39,8 @@ ok(defined $@ && $@ =~ /been destroy\(\)ed/,
    "can't re-destroy scanset");
 
 # Now re-scan, but only for words that occur in the title
-($ss, $n) = scan($conn, '@attr 1=4 w', 6);
+# This time, use a Query object for the start-term
+($ss, $n) = scan($conn, 1, new ZOOM::Query::PQF('@attr 1=4 w'), 6);
 
 $previous = "";		# Sorts before all legitimate terms
 foreach my $i (1 .. $n) {
@@ -48,16 +49,25 @@ foreach my $i (1 .. $n) {
        "got title term $i of $n: '$term' ($occ occurences)");
     ok($term ge $previous, "title term '$term' ge previous '$previous'");
     $previous = $term;
-    ok((grep { $term eq $_ } @terms), "title term was in term list");
+
+    # Previously we used to assert that the each title-term was
+    # included in the initial term-list that we got by scanning across
+    # all indexes.  Of course this will not in general be true,
+    # because not all terms are title terms, which means that the $n
+    # title terms will include some that are past the end of $n
+    # general terms.  So remove that test.
+    #ok((grep { $term eq $_ } @terms), "title term ($term) was in term list (@terms)");
 }
 
 $ss->destroy();
 ok(1, "destroyed second scanset");
 
 # Now re-do the same scan, but limiting the results to four terms at a
-# time.
+# time.  This time, use a CQL query
 $conn->option(number => 4);
-($ss, $n) = scan($conn, '@attr 1=4 w', 4);
+$conn->option(cqlfile => "samples/cql/pqf.properties");
+
+($ss, $n) = scan($conn, 1, new ZOOM::Query::CQL2RPN('title=w', $conn), 4);
 # Get last term and use it as seed for next scan
 my($term, $occ) = $ss->term($n-1);
 ok($ss->option("position") == 1,
@@ -68,9 +78,21 @@ ok(defined $term,
 $ss->destroy();
 ok(1, "destroyed third scanset");
 
+$conn->option(cclfile => "samples/ccl/default.bib");
+($ss, $n) = scan($conn, 1, new ZOOM::Query::CCL2RPN('ti=w', $conn), 4);
+# Get last term and use it as seed for next scan
+($term, $occ) = $ss->term($n-1);
+ok($ss->option("position") == 1,
+   "seed-term is start of returned list");
+ok(defined $term,
+   "got last title term '$term' to use as seed");
+
+$ss->destroy();
+ok(1, "destroyed fourth scanset");
+
 # We want the seed-term to be in "position zero", i.e. just before the start
 $conn->option(position => 0);
-($ss, $n) = scan($conn, "\@attr 1=4 $term", 2);
+($ss, $n) = scan($conn, 0, "\@attr 1=4 $term", 2);
 ok($ss->option("position") == 0,
    "seed-term before start of returned list");
 
@@ -80,29 +102,26 @@ ok($ss->option("position") eq "fruit",
    "option setting/getting works");
 
 $ss->destroy();
-ok(1, "destroyed fourth scanset");
+ok(1, "destroyed fifth scanset");
 
 # Some more testing still to do: see comment in "15-scan.t"
 
 
-my $use_query_for_scan = 0;
 sub scan {
-    my($conn, $startterm, $nexpected) = @_;
+    my($conn, $startterm_is_query, $startterm, $nexpected) = @_;
 
     my $ss;
     eval {
-	if ($use_query_for_scan) {
-	    my $q = new ZOOM::Query::PQF($startterm);
-	    $ss = $conn->scan1($q);
-	} else {
+	if ($startterm_is_query) {
 	    $ss = $conn->scan($startterm);
+	} else {
+	    $ss = $conn->scan_pqf($startterm);
 	}
     };
     ok(!$@, "scan for '$startterm'");
-    $use_query_for_scan = !$use_query_for_scan;
 
     my $n = $ss->size();
     ok(defined $n, "got size");
-    ok($n == $nexpected, "got $n terms (expected $nexpected)");
+    ok($n == $nexpected, "got $n terms for '$startterm' (expected $nexpected)");
     return ($ss, $n);
 }