projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Started on the dx cluster database stuff
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index 093bfb003ca2ae6e9b824f0e097d8e8f4eb48d6a..cfa3d150fe1b3f3ff6220135e81dd6264480fbcd 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-28,6
+28,7
@@
package DXChannel;
use Msg;
use DXUtil;
use DXM;
use Msg;
use DXUtil;
use DXM;
+use DXDebug;
%channels = undef;
%channels = undef;
@@
-41,10
+42,11
@@
use DXM;
oldstate => 'Last State',
list => 'Dependant DXChannels list',
name => 'User Name',
oldstate => 'Last State',
list => 'Dependant DXChannels list',
name => 'User Name',
+ connsort => 'Connection Type'
);
);
-# create a new c
onnection
object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
+# create a new c
hannel
object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
sub new
{
my ($pkg, $call, $conn, $user) = @_;
sub new
{
my ($pkg, $call, $conn, $user) = @_;
@@
-61,21
+63,21
@@
sub new
return $channels{$call} = $self;
}
return $channels{$call} = $self;
}
-# obtain a c
onnection
object by callsign [$obj = DXChannel->get($call)]
+# obtain a c
hannel
object by callsign [$obj = DXChannel->get($call)]
sub get
{
my ($pkg, $call) = @_;
sub get
{
my ($pkg, $call) = @_;
- return $c
onnect
{$call};
+ return $c
hannels
{$call};
}
}
-# obtain all the c
onnection
objects
+# obtain all the c
hannel
objects
sub get_all
{
my ($pkg) = @_;
return values(%channels);
}
sub get_all
{
my ($pkg) = @_;
return values(%channels);
}
-# obtain a c
onnection
object by searching for its connection reference
+# obtain a c
hannel
object by searching for its connection reference
sub get_by_cnum
{
my ($pkg, $conn) = @_;
sub get_by_cnum
{
my ($pkg, $conn) = @_;
@@
-87,7
+89,7
@@
sub get_by_cnum
return undef;
}
return undef;
}
-# get rid of a c
onnection
object [$obj->del()]
+# get rid of a c
hannel
object [$obj->del()]
sub del
{
my $self = shift;
sub del
{
my $self = shift;
@@
-115,10
+117,8
@@
sub send_now
my $line;
foreach $line (@_) {
my $line;
foreach $line (@_) {
- my $t = atime;
chomp $line;
chomp $line;
- print main::DEBUG "$t -> $sort $call $line\n" if defined DEBUG;
- print "-> $sort $call $line\n";
+ dbg('chan', "-> $sort $call $line\n");
$conn->send_now("$sort$call|$line");
}
}
$conn->send_now("$sort$call|$line");
}
}
@@
-144,10
+144,8
@@
sub send # this is always later and always data
my $line;
foreach $line (@_) {
my $line;
foreach $line (@_) {
- my $t = atime;
chomp $line;
chomp $line;
- print main::DEBUG "$t -> D $call $line\n" if defined DEBUG;
- print "-> D $call $line\n";
+ dbg('chan', "-> D $call $line\n");
$conn->send_later("D$call|$line");
}
}
$conn->send_later("D$call|$line");
}
}
@@
-180,10
+178,30
@@
sub state
my $self = shift;
$self->{oldstate} = $self->{state};
$self->{state} = shift;
my $self = shift;
$self->{oldstate} = $self->{state};
$self->{state} = shift;
-
print "Db $self->{call} channel state $self->{oldstate} -> $self->{state}\n" if $main::debug
;
+
dbg('state', "$self->{call} channel state $self->{oldstate} -> $self->{state}\n")
;
}
# various access routines
}
# various access routines
+
+#
+# return a list of valid elements
+#
+
+sub fields
+{
+ return keys(%valid);
+}
+
+#
+# return a prompt for a field
+#
+
+sub field_prompt
+{
+ my ($self, $ele) = @_;
+ return $valid{$ele};
+}
+
sub AUTOLOAD
{
my $self = shift;
sub AUTOLOAD
{
my $self = shift;