ALlow arbitrary options to be specified at end of command-line.

[ZOOM-Perl-moved-to-github.git] / samples / zoom / zoomtst1.pl

diff --git a/samples/zoom/zoomtst1.pl b/samples/zoom/zoomtst1.pl
index 5e05f54..c2b7f56 100644 (file)
--- a/samples/zoom/zoomtst1.pl
+++ b/samples/zoom/zoomtst1.pl
@@ -1,4 +1,4 @@
-# $Id: zoomtst1.pl,v 1.1 2005-10-12 11:53:27 mike Exp $
+# $Id: zoomtst1.pl,v 1.5 2007-08-17 11:08:38 mike Exp $
 #
 # See ../README for a description of this program.
 # perl -I../../blib/lib -I../../blib/arch zoomtst1.pl <target> <query>
@@ -7,22 +7,38 @@ use strict;
 use warnings;
 use ZOOM;
 
-if (@ARGV != 2) {
-    print STDERR "Usage: $0 target query\n";
-    print STDERR "     eg. $0 bagel.indexdata.dk/gils computer\n";
+if (@ARGV < 2 || @ARGV %2 == 1) {
+    print STDERR "Usage: $0 target query [<option> <value> ...]\n";
+    print STDERR "     eg. $0 z3950.indexdata.dk/gils computer\n";
     exit 1;
 }
+my $host = shift(@ARGV);
+my $query = shift(@ARGV);
 
-my($host, $query) = @ARGV;
-my $conn = new ZOOM::Connection($host, 0);
-$conn->option(preferredRecordSyntax => "usmarc");
-my $rs = $conn->search_pqf($query);
-my $n = $rs->size();
-for my $i (0..$n-1) {
-    my $rec = $rs->record($i);
-    print "=== Record ", $i+1, " of $n ===\n";
-    print $rec->render();
-}
+eval {
+    my $conn = new ZOOM::Connection($host, 0);
+    $conn->option(preferredRecordSyntax => "usmarc");
+    while (@ARGV) {
+       my $key = shift(@ARGV);
+       my $value = shift(@ARGV);
+       $conn->option($key => $value);
+    }
 
-$rs->destroy();
-$conn->destroy();
+    my $rs = $conn->search_pqf($query);
+    my $n = $rs->size();
+    print "Query '$query' found $n records\n";
+    for my $i (0..$n-1) {
+       my $rec = $rs->record($i);
+       print "=== Record ", $i+1, " of $n ===\n";
+       print $rec->render();
+    }
+    
+    $rs->destroy();
+    $conn->destroy();
+}; if ($@) {
+    die "Non-ZOOM error: $@" if !$@->isa("ZOOM::Exception");
+    print STDERR "Error ", $@->code(), ": ", $@->message();
+    print STDERR " (", $@->addinfo(), ")" if $@->addinfo();
+    print STDERR "\n";
+    exit 1;
+}