X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=d9674b7e18c21763b3e11aae74d74534ece871f4;hb=8cd84184f5179731f9ed55743f3a8a37c295e499;hp=da496e0b9a8ea0e456decc5efcd42e75bc495e95;hpb=0921a9a14d3632f05b4da736193f7b074040eb94;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index da496e0..d9674b7 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.5 2006-06-21 16:09:02 mike Exp $
+# $Id: IRSpy.pm,v 1.9 2006-07-21 11:28:16 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -76,16 +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 =~ /(.*?)\/(.*)/);
-	    my $new = "$host:$port/$db";
-	    $this->log("irspy_debug", "rewriting '$target' to '$new'");
-	    $target = $new;
+	my($host, $port, $db, $newtarget) = _parse_target_string($target);
+	if ($newtarget ne $target) {
+	    $this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
+	    $target = $newtarget; # This written through the ref
 	}
-	die "invalid target string '$target'"
-	    if !defined $host;
 	push @qlist,
 	    (qq[(host = "$host" and port = "$port" and path="$db")]);
     }
@@ -95,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.
@@ -189,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/ ? () : " ($@)");
@@ -216,7 +230,6 @@ sub record {
 	# 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)};