-# $Id: Connection.pm,v 1.1 2006-10-06 11:33:07 mike Exp $
+# $Id: Connection.pm,v 1.4 2006-10-12 16:54:13 mike Exp $
package ZOOM::IRSpy::Connection;
=cut
-sub new {
+sub create {
my $class = shift();
my $irspy = shift();
- my $this = $class->SUPER::new(@_);
+ my $this = $class->SUPER::create(@_);
$this->{irspy} = $irspy;
$this->{record} = undef;
- $this->{tasks} = undef;
+ $this->{tasks} = [];
return $this;
}
sub tasks {
my $this = shift();
- my($new) = @_;
- my $old = $this->{tasks};
- $this->{tasks} = $new if defined $new;
- return $old;
+ return $this->{tasks};
}
my $old = $this->{current_task};
if (defined $new) {
$this->{current_task} = $new;
- $this->log("irspy_debug", "set current task to $new");
+ $this->log("irspy_task", "set current task to $new");
+ }
+
+ return $old;
+}
+
+
+sub next_task {
+ my $this = shift();
+ my($new) = @_;
+
+ my $old = $this->{next_task};
+ if (defined $new) {
+ $this->{next_task} = $new;
+ $this->log("irspy_task", "set next task to $new");
}
return $old;
sub irspy_connect {
my $this = shift();
- my(%cb) = @_;
+ my($udata, %cb) = @_;
- $this->add_task(new ZOOM::IRSpy::Task::Connect($this, %cb));
- $this->log("irspy", "registered connect()");
+ my $task = new ZOOM::IRSpy::Task::Connect($this, $udata, %cb);
+ $this->add_task($task);
}
sub irspy_search_pqf {
my $this = shift();
- my($query, %cb) = @_;
+ my($query, $udata, %cb) = @_;
- $this->add_task(new ZOOM::IRSpy::Task::Search($query, $this, %cb));
- $this->log("irspy", "registered search_pqf($query)");
+ my $task = new ZOOM::IRSpy::Task::Search($query, $this, $udata, %cb);
+ $this->add_task($task);
}
my $this = shift();
my($task) = @_;
- my $tasks = $this->tasks();
- if (!defined $tasks) {
- $this->tasks([ $task ]);
- } else {
- $tasks->[-1]->{next} = $task;
- push @$tasks, $task;
- }
-
- $this->log("irspy", "added task $task");
-}
-
-
-sub start_task {
- my $this = shift();
- my($task) = @_;
- die "no task defined for " . $this->option("host")
- if !defined $task;
-
- $this->current_task($task);
- $task->run();
+ my $tasks = $this->{tasks};
+ $tasks->[-1]->{next} = $task if @$tasks > 0;
+ push @$tasks, $task;
+ $this->log("irspy_task", "added task $task");
}