X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F15-scan.t;h=fea22a015b1d97e3151056ad5e6bbcff47dcaa8d;hb=9cae37a3bdd1b43adc4ded05b5fee9ef038f5b32;hp=beaf1bd71b297f68f90a90f639408b06583a312d;hpb=3c219af67e67909e1cfd606bc9e908b1ec2c5b5f;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/15-scan.t b/t/15-scan.t
index beaf1bd..fea22a0 100644
--- a/t/15-scan.t
+++ b/t/15-scan.t
@@ -1,5 +1,3 @@
-# $Id: 15-scan.t,v 1.4 2005-11-09 16:47:42 mike Exp $
-
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl 15-scan.t'
 
@@ -11,12 +9,13 @@ BEGIN { use_ok('Net::Z3950::ZOOM') };
 
 my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
 
-my $host = "indexdata.com/gils";
+my $host = "z3950.indexdata.com/gils";
 my $conn = Net::Z3950::ZOOM::connection_new($host, 0);
 $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
 ok($errcode == 0, "connection to '$host'");
 
-my($ss, $n) = scan($conn, "w", 10);
+Net::Z3950::ZOOM::connection_option_set($conn, number => 10);
+my($ss, $n) = scan($conn, 0, "w", 10);
 
 my @terms = ();
 my($occ, $len) = (0, 0);
@@ -32,7 +31,8 @@ foreach my $i (1 .. $n) {
     my $disp = Net::Z3950::ZOOM::scanset_display_term($ss, $i-1, $occ, $len);
     ok(defined $disp && $len eq length($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)");
 }
 
 Net::Z3950::ZOOM::scanset_destroy($ss);
@@ -40,7 +40,10 @@ ok(1, "destroyed scanset");
 ok(1, "(can't re-destroy scanset)"); # Only meaningful in OO API.
 
 # 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
+my $q = Net::Z3950::ZOOM::query_create();
+Net::Z3950::ZOOM::query_prefix($q, '@attr 1=4 w');
+($ss, $n) = scan($conn, 1, $q, 6);
 
 $previous = "";		# Sorts before all legitimate terms
 foreach my $i (1 .. $n) {
@@ -49,16 +52,22 @@ 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");
+    # See comment in 25-scan.t
+    #ok((grep { $term eq $_ } @terms), "title term ($term) was in term list (@terms)");
 }
 
 Net::Z3950::ZOOM::scanset_destroy($ss);
 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
 Net::Z3950::ZOOM::connection_option_set($conn, number => 4);
-($ss, $n) = scan($conn, '@attr 1=4 w', 4);
+Net::Z3950::ZOOM::connection_option_set($conn, cqlfile =>
+					"samples/cql/pqf.properties");
+
+$q = Net::Z3950::ZOOM::query_create();
+Net::Z3950::ZOOM::query_cql2rpn($q, 'title=w', $conn);
+($ss, $n) = scan($conn, 1, $q, 4);
 # Get last term and use it as seed for next scan
 my $term = Net::Z3950::ZOOM::scanset_term($ss, $n-1, $occ, $len);
 ok(Net::Z3950::ZOOM::scanset_option_get($ss, "position") == 1,
@@ -69,19 +78,35 @@ ok(defined $term && $len eq length($term),
 Net::Z3950::ZOOM::scanset_destroy($ss);
 ok(1, "destroyed third scanset");
 
+# Now using CCL
+$q = Net::Z3950::ZOOM::query_create();
+my($ccl_errcode, $ccl_errstr, $ccl_errpos) = (0, "", 0);
+Net::Z3950::ZOOM::query_ccl2rpn($q, 'ti=w', "ti u=4 s=pw",
+				$ccl_errcode, $ccl_errstr, $ccl_errpos);
+($ss, $n) = scan($conn, 1, $q, 4);
+# Get last term and use it as seed for next scan
+$term = Net::Z3950::ZOOM::scanset_term($ss, $n-1, $occ, $len);
+ok(Net::Z3950::ZOOM::scanset_option_get($ss, "position") == 1,
+   "seed-term is start of returned list");
+ok(defined $term && $len eq length($term),
+   "got last title term '$term' to use as seed");
+
+Net::Z3950::ZOOM::scanset_destroy($ss);
+ok(1, "destroyed fourth scanset");
+
 # We want the seed-term to be in "position zero", i.e. just before the start
 Net::Z3950::ZOOM::connection_option_set($conn, position => 0);
-($ss, $n) = scan($conn, "\@attr 1=4 $term", 2);
+($ss, $n) = scan($conn, 0, "\@attr 1=4 $term", 2);
 ok(Net::Z3950::ZOOM::scanset_option_get($ss, "position") == 0,
    "seed-term before start of returned list");
 
 # Silly test of option setting and getting
-Net::Z3950::ZOOM::scanset_option_set($ss, "position", "fruit");
+Net::Z3950::ZOOM::scanset_option_set($ss, position => "fruit");
 ok(Net::Z3950::ZOOM::scanset_option_get($ss, "position") eq "fruit",
    "option setting/getting works");
 
 Net::Z3950::ZOOM::scanset_destroy($ss);
-ok(1, "destroyed fourth scanset");
+ok(1, "destroyed fifth scanset");
 
 # There is no obvious use for scanset_option_set(), and little to be
 # done with scanset_option_get(); and I can't find a server that
@@ -89,13 +114,20 @@ ok(1, "destroyed fourth scanset");
 
 
 sub scan {
-    my($conn, $startterm, $nexpected) = @_;
+    my($conn, $startterm_is_query, $startterm, $nexpected) = @_;
+
+    my $ss;
+    if ($startterm_is_query) {
+	$ss = Net::Z3950::ZOOM::connection_scan1($conn, $startterm);
+    } else {
+	$ss = Net::Z3950::ZOOM::connection_scan($conn, $startterm);
+    }
 
-    $ss = Net::Z3950::ZOOM::connection_scan($conn, $startterm);
     $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
     ok($errcode == 0, "scan for '$startterm'");
-    $n = Net::Z3950::ZOOM::scanset_size($ss);
+
+    my $n = Net::Z3950::ZOOM::scanset_size($ss);
     ok(defined $n, "got size");
-    ok($n == $nexpected, "got $n terms (expected $n)");
+    ok($n == $nexpected, "got $n terms '$startterm' (expected $nexpected)");
     return ($ss, $n);
 }