Clearer use of target vs. id.

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

diff --git a/lib/ZOOM/IRSpy/Connection.pm b/lib/ZOOM/IRSpy/Connection.pm
index 7a90cc9..a932cde 100644 (file)
--- a/lib/ZOOM/IRSpy/Connection.pm
+++ b/lib/ZOOM/IRSpy/Connection.pm
@@ -1,4 +1,4 @@
-# $Id: Connection.pm,v 1.11 2007-03-15 11:37:30 mike Exp $
+# $Id: Connection.pm,v 1.13 2007-04-30 11:28:04 mike Exp $

 
 package ZOOM::IRSpy::Connection;
 
 
 package ZOOM::IRSpy::Connection;
 

@@ -10,7 +10,7 @@ use ZOOM;
 our @ISA = qw(ZOOM::Connection);
 
 use ZOOM::IRSpy::Record;
 our @ISA = qw(ZOOM::Connection);
 
 use ZOOM::IRSpy::Record;

-use ZOOM::IRSpy::Utils qw(cql_target render_record);
+use ZOOM::IRSpy::Utils qw(cql_target render_record irspy_identifier2target);

 
 use ZOOM::IRSpy::Task::Connect;
 use ZOOM::IRSpy::Task::Search;
 
 use ZOOM::IRSpy::Task::Connect;
 use ZOOM::IRSpy::Task::Search;

@@ -38,14 +38,15 @@ the connection.
 sub create {
     my $class = shift();
     my $irspy = shift();
 sub create {
     my $class = shift();
     my $irspy = shift();

-    my $target = shift();
+    my $id = shift();

 
     my $this = $class->SUPER::create(@_);
 
     my $this = $class->SUPER::create(@_);

+    my $target = irspy_identifier2target($id);

     $this->option(host => $target);
     $this->{irspy} = $irspy;
     $this->{tasks} = [];
 
     $this->option(host => $target);
     $this->{irspy} = $irspy;
     $this->{tasks} = [];
 

-    my $query = cql_target($target);
+    my $query = cql_target($id);

     my $rs = $irspy->{conn}->search(new ZOOM::Query::CQL($query));
     my $n = $rs->size();
     $this->log("irspy", "query '$query' found $n records");
     my $rs = $irspy->{conn}->search(new ZOOM::Query::CQL($query));
     my $n = $rs->size();
     $this->log("irspy", "query '$query' found $n records");