X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FConnection.pm;h=a932cdef66e713042e1b9e92def2f9b215947b5a;hp=0e32c8be37f687519c25e0aefc550ea3503e0e7d;hb=0410f05e7bfc3a16c61fadd9ee7f6d3315bec2f5;hpb=f82ec5f3981f549c42123663d7b12af1b6aaf693

diff --git a/lib/ZOOM/IRSpy/Connection.pm b/lib/ZOOM/IRSpy/Connection.pm
index 0e32c8b..a932cde 100644
--- a/lib/ZOOM/IRSpy/Connection.pm
+++ b/lib/ZOOM/IRSpy/Connection.pm
@@ -1,4 +1,4 @@
-# $Id: Connection.pm,v 1.7 2006-11-16 17:18:43 mike Exp $
+# $Id: Connection.pm,v 1.13 2007-04-30 11:28:04 mike Exp $
 
 package ZOOM::IRSpy::Connection;
 
@@ -9,6 +9,9 @@ use warnings;
 use ZOOM;
 our @ISA = qw(ZOOM::Connection);
 
+use ZOOM::IRSpy::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::Retrieve;
@@ -26,24 +29,41 @@ Keeping the private data in these objects removes the need for ugly
 mappings in the IRSpy object itself; adding the methods makes the
 application code cleaner.
 
-The constructor takes an additional first argument, a reference to the
-IRSpy object that it is associated with.
+The constructor takes an two additional leading arguments: a reference
+to the IRSpy object that it is associated with, and the target ID of
+the connection.
 
 =cut
 
 sub create {
     my $class = shift();
     my $irspy = shift();
+    my $id = shift();
 
     my $this = $class->SUPER::create(@_);
+    my $target = irspy_identifier2target($id);
+    $this->option(host => $target);
     $this->{irspy} = $irspy;
-    $this->{record} = undef;
     $this->{tasks} = [];
 
+    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 $zeerex;
+    $zeerex = render_record($rs, 0, "zeerex") if $n > 0;
+    $this->{record} = new ZOOM::IRSpy::Record($this, $target, $zeerex);
+
     return $this;
 }
 
 
+sub destroy {
+    my $this = shift();
+    $this->SUPER::destroy(@_);
+}
+
+
 sub irspy {
     my $this = shift();
     return $this->{irspy};
@@ -107,8 +127,8 @@ sub irspy_connect {
     my $this = shift();
     my($udata, $options, %cb) = @_;
 
-    my $task = new ZOOM::IRSpy::Task::Connect($this, $udata, $options, %cb);
-    $this->add_task($task);
+    $this->add_task(new ZOOM::IRSpy::Task::Connect
+		    ($this, $udata, $options, %cb));
 }
 
 
@@ -116,9 +136,8 @@ sub irspy_search_pqf {
     my $this = shift();
     my($query, $udata, $options, %cb) = @_;
 
-    my $task = new ZOOM::IRSpy::Task::Search($query,
-					     $this, $udata, $options, %cb);
-    $this->add_task($task);
+    $this->add_task(new ZOOM::IRSpy::Task::Search
+		    ($query, $this, $udata, $options, %cb));
 }
 
 
@@ -126,9 +145,8 @@ sub irspy_rs_record {
     my $this = shift();
     my($rs, $index0, $udata, $options, %cb) = @_;
 
-    my $task = new ZOOM::IRSpy::Task::Retrieve($rs, $index0,
-					       $this, $udata, $options, %cb);
-    $this->add_task($task);
+    $this->add_task(new ZOOM::IRSpy::Task::Retrieve
+		    ($rs, $index0, $this, $udata, $options, %cb));
 }