From 9c7fc7a5f2424db4a5e2f770862de63376167171 Mon Sep 17 00:00:00 2001
From: mike <mike>
Date: Fri, 17 Aug 2007 09:38:13 +0000
Subject: [PATCH] Add -q option to scan using a CQL query instead of PQF. Add
 comments showing use of Z39.50/SRUand Type-1/CQL. (Of
 course, the combination CQL-over-Z39.50 doesn't work.)

---
 samples/zoom/zoomscan.pl |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/samples/zoom/zoomscan.pl b/samples/zoom/zoomscan.pl
index cf787fa..e73e0c0 100644
--- a/samples/zoom/zoomscan.pl
+++ b/samples/zoom/zoomscan.pl
@@ -1,24 +1,35 @@
-# $Id: zoomscan.pl,v 1.2 2007-08-16 16:21:08 mike Exp $
+# $Id: zoomscan.pl,v 1.3 2007-08-17 09:38:13 mike Exp $
 #
 # This is the scanning counterpart to zoomscan.pl's searching
 # perl -I../../blib/lib -I../../blib/arch zoomscan.pl <target> <scanQuery>
+#
+# For example (using Z39.50 and SRW, Type-1 and CQL):
+# perl zoomscan.pl tcp:localhost:8018/IR-Explain---1 '@attr 1=dc.title the'
+# perl zoomscan.pl http://localhost:8018/IR-Explain---1 '@attr 1=dc.title the'
+# perl zoomscan.pl -q http://localhost:8018/IR-Explain---1 'dc.title=the'
 
 use strict;
 use warnings;
+use Getopt::Std;
 use ZOOM;
 
-if (@ARGV != 2) {
-    print STDERR "Usage: $0 target scanQuery\n";
-    print STDERR "	eg. $0 z3950.indexdata.dk/gils computer\n";
+my %opts;
+if (!getopts('q', \%opts) || @ARGV != 2) {
+    print STDERR "Usage: $0 [options] target scanQuery
+	-q	Query is CQL [default: PQF]
+	eg. $0 z3950.indexdata.dk/gils computer\n";
     exit 1;
 }
+
 my($host, $scanQuery) = @ARGV;
 
 eval {
     my $conn = new ZOOM::Connection($host, 0);
     $conn->option(preferredRecordSyntax => "usmarc");
     ### Could use ZOOM::Query::CQL below, but that only work in SRU/W.
-    my $ss = $conn->scan(new ZOOM::Query::PQF($scanQuery));
+    my $q = $opts{q} ? new ZOOM::Query::CQL($scanQuery) :
+		       new ZOOM::Query::PQF($scanQuery);
+    my $ss = $conn->scan($q);
     my $n = $ss->size();
     for my $i (0..$n-1) {
 	my($term, $occ) = $ss->term($i);
-- 
1.7.10.4