-# $Id: Connection.pm,v 1.11 2007-03-15 11:37:30 mike Exp $
+# $Id: Connection.pm,v 1.16 2007-05-01 16:30:17 mike Exp $
package ZOOM::IRSpy::Connection;
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;
sub create {
my $class = shift();
my $irspy = shift();
- my $target = shift();
+ my $id = shift();
my $this = $class->SUPER::create(@_);
+ my $target = irspy_identifier2target($id);
$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");
}
-sub irspy_search_pqf {
+sub irspy_search {
my $this = shift();
- my($query, $udata, $options, %cb) = @_;
+ my($qtype, $qstr, $udata, $options, %cb) = @_;
+ #warn "calling $this->irspy_search(", join(", ", @_), ")\n";
$this->add_task(new ZOOM::IRSpy::Task::Search
- ($query, $this, $udata, $options, %cb));
+ ($qtype, $qstr, $this, $udata, $options, %cb));
+}
+
+
+# Wrapper for backwards compatibility
+sub irspy_search_pqf {
+ my $this = shift();
+ return $this->irspy_search("pqf", @_);
}