--- loncom/lond 2001/03/24 21:29:35 1.42 +++ loncom/lond 2001/05/11 19:31:25 1.47 @@ -14,6 +14,8 @@ # 02/12 Gerd Kortemeyer # 03/15 Scott Harrison # 03/24 Gerd Kortemeyer +# 04/02 Scott Harrison +# 05/11 Gerd Kortemeyer # # based on "Perl Cookbook" ISBN 1-56592-243-3 # preforker - server who forks first @@ -969,16 +971,17 @@ sub make_new_child { } # ------------------------------------------------------------------- querysend } elsif ($userinput =~ /^querysend/) { - my ($cmd,$query,$custom)=split(/:/,$userinput); + my ($cmd,$query, + $custom,$customshow)=split(/:/,$userinput); $query=~s/\n*$//g; - unless ($custom) { + unless ($custom or $customshow) { print $client "". sqlreply("$hostid{$clientip}\&$query")."\n"; } else { print $client "". sqlreply("$hostid{$clientip}\&$query". - "\&$custom")."\n"; + "\&$custom"."\&$customshow")."\n"; } # ------------------------------------------------------------------ queryreply } elsif ($userinput =~ /^queryreply/) { @@ -986,8 +989,12 @@ sub make_new_child { my $store; my $execdir=$perlvar{'lonDaemons'}; if ($store=IO::File->new(">$execdir/tmp/$id")) { + $reply=~s/\&/\n/g; print $store $reply; close $store; + my $store2=IO::File->new(">$execdir/tmp/$id.end"); + print $store2 "done\n"; + close $store2; print $client "ok\n"; } else { @@ -1083,7 +1090,7 @@ sub make_new_child { if (-e $ulsdir) { if (opendir(LSDIR,$ulsdir)) { while ($ulsfn=readdir(LSDIR)) { - my @ulsstats=stat($ulsfn); + my @ulsstats=stat($ulsdir.'/'.$ulsfn); $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':'; } closedir(LSDIR);