X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTask%2FSearch.pm;h=68397c089ddbd5a4b4fb97c96b1ac055c63e9fa2;hp=397dbeee29037f713464b3350024ea645ae5c6a1;hb=7b1ce08d86449fb47f358ef2169e54fe78772f23;hpb=d10f84ac6684a1f483629de18d720bb8a8d6bd56

diff --git a/lib/ZOOM/IRSpy/Task/Search.pm b/lib/ZOOM/IRSpy/Task/Search.pm
index 397dbee..68397c0 100644
--- a/lib/ZOOM/IRSpy/Task/Search.pm
+++ b/lib/ZOOM/IRSpy/Task/Search.pm
@@ -1,4 +1,4 @@
-# $Id: Search.pm,v 1.13 2007-03-14 11:56:35 mike Exp $
+# $Id: Search.pm,v 1.16 2007-12-18 11:59:42 mike Exp $
 
 package ZOOM::IRSpy::Task::Search;
 
@@ -25,10 +25,14 @@ ZOOM::IRSpy::Task::Search - a searching task for IRSpy
 
 sub new {
     my $class = shift();
-    my($query) = shift();
+    my $qtype = shift();
+    my $qstr = shift();
+    die "$class: unrecognised query type '$qtype'"
+	if !grep { $qtype eq $_ } qw(pqf cql);
 
     my $this = $class->SUPER::new(@_);
-    $this->{query} = $query;
+    $this->{qtype} = $qtype;
+    $this->{qstr} = $qstr;
     $this->{rs} = undef;
     return $this;
 }
@@ -41,27 +45,48 @@ sub run {
     my $conn = $this->conn();
     $conn->connect($conn->option("host"));
 
-    my $query = $this->{query};
+    my $qtype = $this->{qtype};
+    my $qstr = $this->{qstr};
     $this->irspy()->log("irspy_task", $conn->option("host"),
-			" searching for '$query'");
+			" searching for '$qtype:$qstr'");
     die "task $this has resultset?!" if defined $this->{rs};
 
+    my $query;
+    if ($qtype eq "pqf") {
+	$query = new ZOOM::Query::PQF($qstr);
+    } elsif ($qtype eq "cql") {
+	$query = new ZOOM::Query::CQL($qstr);
+    } else {
+	die "Huh?!";
+    }
+
     ### Note well that when this task runs, it creates a result-set
     #	object which MUST BE DESTROYED in order to prevent large-scale
     #	memory leakage.  So when creating a Task::Search, it is the
     #	APPLICATION'S RESPONSIBILITY to ensure that the callback
     #	invoked on success OR FAILURE makes arrangements for the set
     #	to be destroyed.
-    $this->{rs} = $conn->search_pqf($query);
+    eval {
+	$this->{rs} = $conn->search($query);
+    }; if ($@) {
+	die "remote search '$query' had error: '$@'";
+    }
+
     warn "no ZOOM-C level events queued by $this"
 	if $conn->is_idle();
 
     $this->set_options();
 }
 
+# Unique to Task::Search, used only for logging
+sub render_query {
+    my $this = shift();
+    return $this->{qtype} . ":" . $this->{qstr}    
+}
+
 sub render {
     my $this = shift();
-    return ref($this) . "(" . $this->{query} . ")";
+    return ref($this) . "(" . $this->render_query() . ")";
 }
 
 use overload '""' => \&render;