X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=bin%2Firspy.pl;h=0e86dfd8d36b2a734e2099e5ed171ebcd4054756;hp=fb2f8aad89b8ecc49ae987ee9a38637bc6682791;hb=b53c490927fa69c05d6c82c15a4f29d3ba1c1da5;hpb=8db66fb017ad23a10f1464a05a98db2e91c7e987

diff --git a/bin/irspy.pl b/bin/irspy.pl
index fb2f8aa..0e86dfd 100755
--- a/bin/irspy.pl
+++ b/bin/irspy.pl
@@ -1,9 +1,10 @@
 #!/usr/bin/perl -w
 
-# $Id: irspy.pl,v 1.15 2006-10-17 11:50:07 mike Exp $
+# $Id: irspy.pl,v 1.24 2007-02-27 15:01:40 mike Exp $
 #
 # Run like this:
-#	YAZ_LOG=irspy,irspy_task perl -I ../lib irspy.pl -t Quick 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 z3950.loc.gov:7090/Voyager bagel.indexdata.dk/gils bagel.indexdata.dk:210/marc
+#	YAZ_LOG=irspy,irspy_test sudo ./setrlimit -n 3000 -u mike -- perl -I../lib irspy.pl -t Main -a localhost:8018/IR-Explain---1
 # Available log-levels are as follows:
 #	irspy -- high-level application logging
 #	irspy_debug -- low-level debugging (not very interesting)
@@ -12,28 +13,60 @@
 #	irspy_test -- adding, queueing and running tests
 #	irspy_task -- adding, queueing and running tasks
 
+# 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 strict;
 use warnings;
 use Getopt::Std;
-use ZOOM::IRSpy;
+use ZOOM::IRSpy::Web;
+use Carp;
+
+local $SIG{__DIE__} = sub {
+    my($msg) = @_;
+    confess($msg);
+};
 
 my %opts;
-if (!getopts('t:', \%opts) || @ARGV < 1) {
+if (!getopts('wt:af:', \%opts) || @ARGV < 1) {
     print STDERR "\
 Usage $0: [options] <IRSpy-database> [<target> ...]
-If no targets are specified, all targets in DB are tested.
+	-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
 ";
     exit 1;
 }
 
 my($dbname, @targets) = @ARGV;
-my $spy = new ZOOM::IRSpy($dbname, "admin", "fruitbat");
-$spy->targets(@targets) if @targets;
+my $class = "ZOOM::IRSpy";
+$class .= "::Web" if $opts{w};
+
+my $spy = $class->new($dbname, "admin", "fruitbat");
+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 1;
+}
+
 $spy->initialise();
 my $res = $spy->check($opts{t});
 if ($res == 0) {
-    print "All tests were run\n";
+    print "All tests were attempted\n";
 } else {
     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 }