X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=71c84bddb1fb04c4002f061d0bfb801df2df90a0;hp=7ed3046b5ea58c97acbecb428e5bda674fd52aa3;hb=d865b850cd4bdb4a44db23af3b291cfbce4510e8;hpb=e96e7bc92ab442c65ea2f4fb72db35a1ab12e938;ds=sidebyside

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 7ed3046..71c84bd 100644
--- 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.8 2006-07-21 11:27:02 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'");
 
@@ -69,15 +76,11 @@ sub targets {
     my @targets = split /\s+/, $targetList;
     my @qlist;
     foreach my $target (@targets) {
-	my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/);
-	if (!defined $host) {
-	    $port = 210;
-	    ($host, $db) = ($target =~ /(.*?)\/(.*)/);
-	    $this->log("irspy", "rewrote '$target' to '$host:$port/$db'");
-	    $target = "$host:$port/$db";
+	my($host, $port, $db, $newtarget) = _parse_target_string($target);
+	if ($newtarget ne $target) {
+	    $this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
+	    $target = $newtarget; ### Does this get written through the ref?
 	}
-	die "invalid target string '$target'"
-	    if !defined $host;
 	push @qlist,
 	    (qq[(host = "$host" and port = "$port" and path="$db")]);
     }
@@ -87,6 +90,23 @@ sub targets {
 }
 
 
+# Also used by ZOOM::IRSpy::Record
+sub _parse_target_string {
+    my($target) = @_;
+
+    my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/);
+    if (!defined $host) {
+	$port = 210;
+	($host, $db) = ($target =~ /(.*?)\/(.*)/);
+	$target = "$host:$port/$db";
+    }
+    die "invalid target string '$target'"
+	if !defined $host;
+
+    return ($host, $port, $db, $target);
+}
+
+
 # There are two cases.
 #
 # 1. A specific set of targets is nominated on the command line.
@@ -137,14 +157,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 +201,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 +216,27 @@ 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");
+    }
+
+    return $this->{target2record}->{lc($target)};
+}
+
+
+
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record