From fe61be48fd3de9c6a508087650443be7617217ba Mon Sep 17 00:00:00 2001
From: mike <mike>
Date: Thu, 16 Aug 2007 17:19:35 +0000
Subject: [PATCH] Explicitly use client-side CQL-to-RPN scan-query conversion.
  This was happenning anyway before, due to bug in ZOOM-C,
 but now that's been fixed.

---
 t/15-scan.t |    4 ++--
 t/25-scan.t |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/15-scan.t b/t/15-scan.t
index 5a223a4..f894513 100644
--- a/t/15-scan.t
+++ b/t/15-scan.t
@@ -1,4 +1,4 @@
-# $Id: 15-scan.t,v 1.13 2006-11-02 17:48:26 mike Exp $
+# $Id: 15-scan.t,v 1.14 2007-08-16 17:19:35 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'
@@ -65,7 +65,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);
diff --git a/t/25-scan.t b/t/25-scan.t
index d0a5927..a6da292 100644
--- a/t/25-scan.t
+++ b/t/25-scan.t
@@ -1,4 +1,4 @@
-# $Id: 25-scan.t,v 1.10 2006-11-02 17:48:26 mike Exp $
+# $Id: 25-scan.t,v 1.11 2007-08-16 17:19:35 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'
@@ -60,7 +60,7 @@ ok(1, "destroyed second scanset");
 $conn->option(number => 4);
 $conn->option(cqlfile => "samples/cql/pqf.properties");
 
-($ss, $n) = scan($conn, 1, new ZOOM::Query::CQL('title=w'), 4);
+($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,
-- 
1.7.10.4