projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abstract out identifier format, which is now handled by a set of functions in Utils...
[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
950c19e
..
bd44b12
100644
(file)
--- a/
lib/ZOOM/IRSpy/Connection.pm
+++ b/
lib/ZOOM/IRSpy/Connection.pm
@@
-1,4
+1,4
@@
-# $Id: Connection.pm,v 1.8 2007-03-05 19:43:10 mike Exp $
+# $Id: Connection.pm,v 1.12 2007-04-27 14:04:40 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;
@@
-41,7
+41,7
@@
sub create {
my $target = shift();
my $this = $class->SUPER::create(@_);
my $target = shift();
my $this = $class->SUPER::create(@_);
- $this->option(host => $target);
+ $this->option(host => irspy_identifier2target($target));
$this->{irspy} = $irspy;
$this->{tasks} = [];
$this->{irspy} = $irspy;
$this->{tasks} = [];
@@
-51,12
+51,19
@@
sub create {
$this->log("irspy", "query '$query' found $n records");
my $zeerex;
$zeerex = render_record($rs, 0, "zeerex") if $n > 0;
$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);
+ $this->{record} = new ZOOM::IRSpy::Record($this,
+ irspy_identifier2target($target), $zeerex);
return $this;
}
return $this;
}
+sub destroy {
+ my $this = shift();
+ $this->SUPER::destroy(@_);
+}
+
+
sub irspy {
my $this = shift();
return $this->{irspy};
sub irspy {
my $this = shift();
return $this->{irspy};
@@
-120,8
+127,8
@@
sub irspy_connect {
my $this = shift();
my($udata, $options, %cb) = @_;
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));
}
}
@@
-129,9
+136,8
@@
sub irspy_search_pqf {
my $this = shift();
my($query, $udata, $options, %cb) = @_;
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));
}
}
@@
-139,9
+145,8
@@
sub irspy_rs_record {
my $this = shift();
my($rs, $index0, $udata, $options, %cb) = @_;
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));
}
}