X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=e86abd1a4f76c3f35a7150b7a0a72550e7d4a658;hb=36e0c1ffda9295a4090eab75360f1b59d964ada3;hp=cec310961b3feda189d3059536cf369a142fa0c9;hpb=0ce79a125db0acb043fceaa641d8b3a9eae71a41;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index cec31096..e86abd1a 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -37,6 +37,7 @@ use DB_File;
 use VE7CC;
 use DXXml;
 use AsyncMsg;
+use JSON;
 
 use Mojo::IOLoop;
 use Mojo::IOLoop::ForkCall;
@@ -122,6 +123,7 @@ sub start
 	$self->{ann_talk} = $user->wantann_talk;
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
+	$self->{lastmsgpoll} = 0;
 
 	# sort out new dx spot stuff
 	$user->wantdxcq(0) unless defined $user->{wantdxcq};
@@ -564,7 +566,7 @@ sub process
 	my $dxchan;
 	
 	foreach $dxchan (@dxchan) {
-		next if $dxchan->sort ne 'U';  
+		next unless $dxchan->{sort} eq 'U';  
 	
 		# send a outstanding message prompt if required
 		if ($t >= $dxchan->lastmsgpoll + $msgpolltime) {
@@ -1166,6 +1168,9 @@ sub import_cmd
 	my @names = readdir(DIR);
 	closedir(DIR);
 	my $name;
+
+	return unless @names;
+	
 	foreach $name (@names) {
 		next if $name =~ /^\./;
 
@@ -1248,9 +1253,13 @@ sub send_motd
 
 # Punt off a long running command into a separate process
 #
-# Hhis is called from commands to run some potentially long running
+# This is called from commands to run some potentially long running
 # function. The process forks and then runs the function and returns
 # the result back to the cmd. 
+#
+# NOTE: this merely forks the current process and then runs the cmd in that (current) context.
+#       IT DOES NOT START UP SOME NEW PROGRAM AND RELIES ON THE FACT THAT IT IS RUNNING DXSPIDER 
+#       THE CURRENT CONTEXT!!
 # 
 # call: $self->spawn_cmd(\<function>, [cb => sub{...}], [prefix => "cmd> "], [progress => 0|1], [args => [...]]);
 sub spawn_cmd
@@ -1264,11 +1273,13 @@ sub spawn_cmd
 	my $cb = delete $args{cb};
 	my $prefix = delete $args{prefix};
 	my $progress = delete $args{progress};
-	my $args = delete $args{args};
+	my $args = delete $args{args} || [];
 
 	no strict 'refs';
 		
 	my $fc = Mojo::IOLoop::ForkCall->new;
+	$fc->serializer(\&encode_json);
+	$fc->deserializer(\&decode_json);
 	$fc->run(
 			 sub {my @args = @_; my @res = $cmdref->(@args); return @res},
 			 $args,