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

diff --git a/lib/ZOOM/IRSpy/Connection.pm b/lib/ZOOM/IRSpy/Connection.pm
index a932cde..6664168 100644
--- a/lib/ZOOM/IRSpy/Connection.pm
+++ b/lib/ZOOM/IRSpy/Connection.pm
@@ -1,4 +1,3 @@
-# $Id: Connection.pm,v 1.13 2007-04-30 11:28:04 mike Exp $
 
 package ZOOM::IRSpy::Connection;
 
@@ -47,9 +46,22 @@ sub create {
     $this->{tasks} = [];
 
     my $query = cql_target($id);
-    my $rs = $irspy->{conn}->search(new ZOOM::Query::CQL($query));
+    my $rs;
+    eval {
+	$rs = $irspy->{conn}->search(new ZOOM::Query::CQL($query));
+    }; if ($@) {
+	# This should be a "can't happen", but junk entries such as
+	#	//lucasportal.info/blogs/payday-usa">'</a>night:G<a href="http://lucasportal.info/blogs/payday-usa">'</a>night/Illepeliz
+	# (yes, really) yield BIB-1 diagnostic 108 "Malformed query"
+	warn "registry search for record '$id' had error: '$@' -- skipping";
+	return undef;
+    }
     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 +144,21 @@ sub irspy_connect {
 }
 
 
-sub irspy_search_pqf {
+sub irspy_search {
     my $this = shift();
-    my($query, $udata, $options, %cb) = @_;
+    my($qtype, $qstr, $udata, $options, %cb) = @_;
 
+    { use Carp; confess "Odd-sized hash!" if @_ % 2; }
+    #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", @_);
 }