X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F15-scan.t;h=0885cf3e5afc1694470c89019aafbe086aef826c;hb=bfc5f84e9137e6d6f348274f8a3dbb555525cf7d;hp=cc8a75f4106965cc2d6ef921bb4bcad7356fa4ae;hpb=3ba44bb7023ad2e1d312b7858066525a536522c3;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/15-scan.t b/t/15-scan.t
index cc8a75f..0885cf3 100644
--- a/t/15-scan.t
+++ b/t/15-scan.t
@@ -1,5 +1,3 @@
-# $Id: 15-scan.t,v 1.10 2006-06-13 16:44:21 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,11 +9,12 @@ 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'");
 
+Net::Z3950::ZOOM::connection_option_set($conn, number => 10);
 my($ss, $n) = scan($conn, 0, "w", 10);
 
 my @terms = ();
@@ -65,7 +64,7 @@ Net::Z3950::ZOOM::connection_option_set($conn, cqlfile =>
 					"samples/cql/pqf.properties");
 
 $q = Net::Z3950::ZOOM::query_create();
-Net::Z3950::ZOOM::query_cql($q, 'title=w');
+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);
@@ -78,10 +77,10 @@ Net::Z3950::ZOOM::scanset_destroy($ss);
 ok(1, "destroyed third scanset");
 
 # Now using CCL
-Net::Z3950::ZOOM::connection_option_set($conn, cclfile =>
-					"samples/ccl/default.bib");
 $q = Net::Z3950::ZOOM::query_create();
-Net::Z3950::ZOOM::query_ccl2rpn($q, 'ti=w', $conn);
+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);
@@ -127,6 +126,6 @@ sub scan {
 
     my $n = Net::Z3950::ZOOM::scanset_size($ss);
     ok(defined $n, "got size");
-    ok($n == $nexpected, "got $n terms (expected $nexpected)");
+    ok($n == $nexpected, "got $n terms '$startterm' (expected $nexpected)");
     return ($ss, $n);
 }