_run_test() can now cope with complex text-class names such as Search::Title

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 7ed3046..0fb95f7 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.3 2006-06-20 16:32:03 mike Exp $
+# $Id: IRSpy.pm,v 1.6 2006-06-21 16:24:55 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -29,7 +29,11 @@ protocols.  It is a successor to the ZSpy program.
 
 =cut
 
-BEGIN { ZOOM::Log::mask_str("irspy") }
+BEGIN {
+    ZOOM::Log::mask_str("irspy");
+    ZOOM::Log::mask_str("irspy_test");
+    ZOOM::Log::mask_str("irspy_debug");
+}
 
 sub new {
     my $class = shift();
@@ -41,7 +45,10 @@ sub new {
     my $this = bless {
        conn => $conn,
        allrecords => 1,        # unless overridden by targets()
-       # query and targets will be filled in later
+       query => undef,         # filled in later
+       targets => undef,       # filled in later
+       target2record => undef, # filled in later
+       pod => undef,           # filled in later
     }, $class;
     $this->log("irspy", "starting up with database '$dbname'");
 
@@ -73,8 +80,9 @@ sub targets {
        if (!defined $host) {
            $port = 210;
            ($host, $db) = ($target =~ /(.*?)\/(.*)/);
-           $this->log("irspy", "rewrote '$target' to '$host:$port/$db'");
-           $target = "$host:$port/$db";
+           my $new = "$host:$port/$db";
+           $this->log("irspy_debug", "rewriting '$target' to '$new'");
+           $target = $new;
        }
        die "invalid target string '$target'"
            if !defined $host;
@@ -137,14 +145,17 @@ sub initialise {
     foreach my $target (keys %target2record) {
        my $record = $target2record{$target};
        if (!defined $record) {
-           $this->log("irspy", "made new record for '$target'");
+           $this->log("irspy_debug", "made new record for '$target'");
            $target2record{$target} = new ZOOM::IRSpy::Record($target);
        } else {
-           $this->log("irspy", "using existing record for '$target'");
+           $this->log("irspy_debug", "using existing record for '$target'");
        }
     }
 
+    $this->{target2record} = \%target2record;
     $this->{pod} = new ZOOM::Pod(@{ $this->{targets} });
+    delete $this->{targets};   # The information is now in the Pod.
+    delete $this->{query};     # Not needed at all
 }
 
 
@@ -178,7 +189,9 @@ sub _run_test {
     my($tname) = @_;
 
     eval {
-       require "ZOOM/IRSpy/Test/$tname.pm";
+       my $slashSeperatedTname = $tname;
+       $slashSeperatedTname =~ s/::/\//g;
+       require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
     }; if ($@) {
        $this->log("warn", "can't load test '$tname': skipping",
                   $@ =~ /^Can.t locate/ ? () : " ($@)");
@@ -191,6 +204,28 @@ sub _run_test {
 }
 
 
+# Access methods for the use of Test modules
+sub pod {
+    my $this = shift();
+    return $this->{pod};
+}
+
+sub record {
+    my $this = shift();
+    my($target) = @_;
+
+    if (ref($target) && $target->isa("ZOOM::Connection")) {
+       # Can be called with a Connection instead of a target-name
+       my $conn = $target;
+       $target = $conn->option("host");
+       $this->log("irspy_debug", "record() resolved $conn to '$target'");
+    }
+
+    return $this->{target2record}->{lc($target)};
+}
+
+
+
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record