X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=bin%2Firspy.pl;h=fef62d135179ff66f6a051b610787c3c7eb99dd3;hp=1888a4a9977822a2a9fd917bd566183bb1c4c8a9;hb=97b338e0de2f8d60bb9de1d7fdf5574d092fa736;hpb=3ba77e5819b86c98fc23fb18588cc52c73ec3a27

diff --git a/bin/irspy.pl b/bin/irspy.pl
index 1888a4a..fef62d1 100755
--- a/bin/irspy.pl
+++ b/bin/irspy.pl
@@ -1,38 +1,64 @@
 #!/usr/bin/perl -w
 
-# $Id: irspy.pl,v 1.6 2006-09-22 15:23:51 mike Exp $
+# $Id: irspy.pl,v 1.23 2007-02-24 01:26:32 mike Exp $
 #
 # Run like this:
-#	YAZ_LOG=irspy,irspy_test,irspy_debug perl -I ../lib irspy.pl -t "bagel.indexdata.dk/gils z3950.loc.gov:7090/Voyager" localhost:3313/IR-Explain---1
+#	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
+# 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
 
 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:a', \%opts) || @ARGV != 1) {
-    print STDERR qq[Usage: $0 [options] <IRSpy-database>
-	-t <t1 t2 ...>	Space-separated list of targets to check
-	-a		Check all targets registered in database
-];
+if (!getopts('wt:af:', \%opts) || @ARGV < 1) {
+    print STDERR "\
+Usage $0: [options] <IRSpy-database> [<target> ...]
+	-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 = $ARGV[0];
-my $targetList = $opts{t};
-if (!defined $targetList && !$opts{a}) {
-    print STDERR "$0: neither -t nor -a specified\n";
-    exit 2;
+my($dbname, @targets) = @ARGV;
+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;
 }
 
-my $spy = new ZOOM::IRSpy($dbname, "admin", "fruitbat");
-$spy->targets(grep { $_ ne "" } split /\s+/, $targetList)
-    if defined $targetList;
 $spy->initialise();
-my $res = $spy->check();
+my $res = $spy->check($opts{t});
 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 }