X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=bin%2Firspy.pl;h=2e90ce9d7766f8c0d641f7bdfe60ed5ef94cec17;hp=17f4df301d3552f68431dc3026b3d9daf37f7ecc;hb=bede31050ee10e9a8a3dd20f91ab9d62e0f5af66;hpb=56be0e4117b0024024cba3b041d27cc1963dba26

diff --git a/bin/irspy.pl b/bin/irspy.pl
index 17f4df3..2e90ce9 100755
--- a/bin/irspy.pl
+++ b/bin/irspy.pl
@@ -1,32 +1,101 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
-# $Id: irspy.pl,v 1.10 2006-10-06 11:25:11 mike Exp $
-#
 # Run like this:
-#	YAZ_LOG=irspy,irspy_test,irspy_debug,irspy_event perl -I ../lib irspy.pl localhost:3313/IR-Explain---1 bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager bagel.indexdata.dk:210/marc 
+#	YAZ_LOG=irspy,irspy_test IRSPY_SAVE_XML=1 perl -I../lib irspy.pl -t Quick localhost:8018/IR-Explain---1 Z39.50:amicus.oszk.hu:1616/ANY
+#	YAZ_LOG=irspy,irspy_test IRSPY_SAVE_XML=1 perl -I../lib irspy.pl -t Quick -r ../etc/dallas.rules localhost:8018/IR-Explain---1 Z39.50:catalog.dallaslibrary.org:210/PAC
+#	YAZ_LOG=irspy,irspy_test sudo ./setrlimit -n 3000 -u mike -- perl -I../lib irspy.pl -t Main -a localhost:8018/IR-Explain---1
+#	YAZ_LOG=irspy,irspy_test perl -I../lib irspy.pl -t Main -a -n 100 localhost:8018/IR-Explain---1
+#
+# Available log-levels are as follows:
+#	irspy -- high-level application logging
+#	irspy_debug -- low-level debugging (not very interesting)
+#	irspy_event -- invocations of ZOOM_event() and individual events
+#	irspy_unhandled -- unhandled events (not very interesting)
+#	irspy_test -- adding, queueing and running tests
+#	irspy_task -- adding, queueing and running tasks
+#	irspy_data -- XML data written to registry
+
+# I have no idea why this directory is not in Ubuntu's default Perl
+# path, but we need it because just occasionally overload.pm:88
+# requires Scalar::Util, which is in this directory.
+#use lib '/usr/share/perl/5.8.7';
+
+use Scalar::Util;
+use Getopt::Std;
+use ZOOM::IRSpy::Web;
+use Carp;
 
 use strict;
 use warnings;
-use Getopt::Std;
-use ZOOM::IRSpy;
+
+$SIG{__DIE__} = sub {
+    my($msg) = @_;
+    confess($msg);
+};
 
 my %opts;
-if (!getopts('t:', \%opts) || @ARGV < 1) {
+if (!getopts('dwt:af:n:m:r:M:', \%opts) || @ARGV < 1) {
     print STDERR "\
 Usage $0: [options] <IRSpy-database> [<target> ...]
-If no targets are specified, all targets in DB are tested.
+	-d		debug
+	-w		Use ZOOM::IRSpy::Web subclass
 	-t <test>	Run the specified <test> [default: all tests]
+	-a		Test all targets (slow!)
+	-f <query>	Test targets found by the specified query
+	-n <number>	Number of connection to keep in active set
+	-m <n>,<i>	Only test targets whose hash mod <n> is <i>
+	-r <rulesFile>	Apply rules found in named file
+	-M max_depth 	maximum number of nested template calls and variables/params
 ";
     exit 1;
 }
 
 my($dbname, @targets) = @ARGV;
-my $spy = new ZOOM::IRSpy($dbname, "admin", "fruitbat");
-$spy->targets(@targets) if @targets;
-$spy->initialise();
-my $res = $spy->check($opts{t});
+my $class = "ZOOM::IRSpy";
+$class .= "::Web" if $opts{w};
+
+if ($opts{M} && $opts{M} > 0) {
+    no warnings;
+    $ZOOM::IRSpy::xslt_max_depth = $opts{M};
+}
+if ($opts{d}) { 
+    no warnings;
+    $ZOOM::IRSpy::debug = $opts{d};
+}
+
+my $spy = $class->new($dbname, "admin", "fruitbat", $opts{n});
+if (@targets) {
+    $spy->targets(@targets);
+} elsif ($opts{f}) {
+    $spy->find_targets($opts{f});
+} elsif (!$opts{a}) {
+    print STDERR "$0: specify -a, -f <query> or list of targets\n";
+    exit 2;
+}
+
+if (defined $opts{m}) {
+    my($n, $i) = ($opts{m} =~ /^(\d+),(\d+)$/);
+    if (!defined $n) {
+	print STDERR "$0: argument to -m must be of the form <n>,<i>\n";
+	exit 3;
+    }
+    $spy->restrict_modulo($n, $i);
+}
+
+if (defined $opts{r}) {
+    $spy->apply_rules($opts{r})
+}
+
+$spy->initialise($opts{t});
+my $res = $spy->check();
 if ($res == 0) {
-    print "All tests were run\n";
+    print "All tests were attempted\n";
 } else {
-    print "Some tests were skipped\n";
+    print "$res tests were skipped\n";
 }
+
+
+# Fake the HTML::Mason class that ZOOM::IRSpy::Web uses
+package HTML::Mason::Commands;
+BEGIN { our $m = bless {}, "HTML::Mason::Commands" }
+sub flush_buffer { print shift(), " flushing\n" if 0 }