use "record"/"records" in logging depending on number of hits.

[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 a932cde..5ee0726 100644 (file)
--- a/lib/ZOOM/IRSpy/Connection.pm
+++ b/lib/ZOOM/IRSpy/Connection.pm
@@ -1,4 +1,4 @@
-# $Id: Connection.pm,v 1.13 2007-04-30 11:28:04 mike Exp $
+# $Id: Connection.pm,v 1.18 2007-12-12 10:47:21 mike Exp $
 
 package ZOOM::IRSpy::Connection;
 
@@ -49,7 +49,11 @@ sub create {
     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");
+    $this->log("irspy", "query '$query' found $n record", $n==1 ? "" : "s");
+    ### More than 1 hit is always an error and indicates duplicate
+    #   records in the database; no hits is fine for a new target
+    #   being probed for the first time, but not if the connection is
+    #   being created as part of an "all known targets" scan.
     my $zeerex;
     $zeerex = render_record($rs, 0, "zeerex") if $n > 0;
     $this->{record} = new ZOOM::IRSpy::Record($this, $target, $zeerex);
@@ -132,12 +136,20 @@ sub irspy_connect {
 }
 
 
-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", @_);
 }