X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=t%2F12-query.t;h=d21204bf47ffc4ef500e146d790cf592f0616f25;hb=87c72eaf97a3dbf51a93dab782c2909539addc48;hp=eb4fa3d8a47ac1c97425be2a205731306df4bbee;hpb=6c5da63e648176a2460785d1a3eb78706363e1e1;p=ZOOM-Perl-moved-to-github.git

diff --git a/t/12-query.t b/t/12-query.t
index eb4fa3d..d21204b 100644
--- a/t/12-query.t
+++ b/t/12-query.t
@@ -1,5 +1,3 @@
-# $Id: 12-query.t,v 1.6 2006-06-13 16:15:12 mike Exp $
-
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl 12-query.t'
 
@@ -46,7 +44,7 @@ ok(1, "destroyed complex query");
 # no other uses of query objects -- but we need to establish a
 # connection for it to work on first.
 
-my $host = "indexdata.com/gils";
+my $host = "z3950.indexdata.com/gils";
 my $conn = Net::Z3950::ZOOM::connection_new($host, 0);
 my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
 $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
@@ -102,28 +100,29 @@ ok($res == 0, "created CQL2RPN query");
 check_record($conn, $q);
 Net::Z3950::ZOOM::query_destroy($q);
 
-# Client-side compiled CCL: this will fail due to lack of qualifier-file
+# Client-side compiled CCL: this will fail due to incorrect syntax
 $q = Net::Z3950::ZOOM::query_create();
 ok(defined $q, "create empty query");
+my($ccl_errcode, $ccl_errstr, $ccl_errpos) = (0, "", 0);
+
 $res = Net::Z3950::ZOOM::query_ccl2rpn($q,
-				       'ti=utah and ab=epicenter',
-				       $conn);
-$errcode = Net::Z3950::ZOOM::connection_error_x($conn, $errmsg, $addinfo,
-						$diagset);
+				       'ti=utah and',
+				       "ti u=4 s=pw\nab u=62 s=pw",
+				       $ccl_errcode, $ccl_errstr, $ccl_errpos);
 ok($res < 0 &&
-   $errcode == Net::Z3950::ZOOM::ERROR_CCL_CONFIG &&
-   $diagset eq "ZOOM",
-   "can't make CCL2RPN query: error " . $errcode);
+   $ccl_errcode == Net::Z3950::ZOOM::CCL_ERR_TERM_EXPECTED,
+   "can't make CCL2RPN query: error $ccl_errcode ($ccl_errstr)");
 Net::Z3950::ZOOM::query_destroy($q);
 
 # Do a successful client-compiled CCL search
 $q = Net::Z3950::ZOOM::query_create();
 ok(defined $q, "create empty query");
-Net::Z3950::ZOOM::connection_option_set($conn, cclfile =>
-					"samples/ccl/default.bib");
 $res = Net::Z3950::ZOOM::query_ccl2rpn($q,
 				       'ti=utah and ab=epicenter',
-				       $conn);
+				       "ti u=4 s=pw\nab u=62 s=pw",
+				       $ccl_errcode,
+				       $ccl_errstr,
+				       $ccl_errpos);
 ok($res == 0, "created CCL2RPN query");
 check_record($conn, $q);
 Net::Z3950::ZOOM::query_destroy($q);
@@ -146,8 +145,7 @@ sub check_record {
     my $rec = Net::Z3950::ZOOM::resultset_record($rs, 0);
     ok(1, "got record idenfified by query");
 
-    my $len = 0;
-    my $data = Net::Z3950::ZOOM::record_get($rec, "render", $len);
+    my $data = Net::Z3950::ZOOM::record_get($rec, "render");
     ok(1, "rendered record");
     ok($data =~ /^035    \$a ESDD0006$/m, "record is the expected one");