--- loncom/lond	2001/03/22 13:28:15	1.38
+++ loncom/lond	2001/05/28 13:13:58	1.48
@@ -13,6 +13,9 @@
 # Jan 01 Scott Harrison
 # 02/12 Gerd Kortemeyer
 # 03/15 Scott Harrison
+# 03/24 Gerd Kortemeyer
+# 04/02 Scott Harrison
+# 05/11,05/28 Gerd Kortemeyer
 #
 # based on "Perl Cookbook" ISBN 1-56592-243-3
 # preforker - server who forks first
@@ -668,6 +671,9 @@ sub make_new_child {
                                print $sh "$clientip:$now\n";
 			    }
 			   }
+                           unless ($fname=~/\.meta$/) {
+			       unlink("$fname.meta.$hostid{$clientip}");
+                           }
                            $fname=~s/\/home\/httpd\/html\/res/raw/;
                            $fname="http://$thisserver/".$fname;
                            print $client "$fname\n";
@@ -703,7 +709,7 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
@@ -828,7 +834,7 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
@@ -899,7 +905,7 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
@@ -965,18 +971,30 @@ sub make_new_child {
                        }
 # ------------------------------------------------------------------- querysend
                    } elsif ($userinput =~ /^querysend/) {
-                       my ($cmd,$query)=split(/:/,$userinput);
+                       my ($cmd,$query,
+			   $custom,$customshow)=split(/:/,$userinput);
 		       $query=~s/\n*$//g;
-		       print $client sqlreply("$hostid{$clientip}\&$query").
-			             "\n";
+		       unless ($custom or $customshow) {
+			   print $client "".
+			       sqlreply("$hostid{$clientip}\&$query")."\n";
+		       }
+		       else {
+			   print $client "".
+			       sqlreply("$hostid{$clientip}\&$query".
+					"\&$custom"."\&$customshow")."\n";
+		       }
 # ------------------------------------------------------------------ queryreply
                    } elsif ($userinput =~ /^queryreply/) {
                        my ($cmd,$id,$reply)=split(/:/,$userinput); 
 		       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 {
@@ -1070,10 +1088,13 @@ sub make_new_child {
                        my $ulsout='';
                        my $ulsfn;
                        if (-e $ulsdir) {
-                          while ($ulsfn=<$ulsdir/*>) {
-			     my @ulsstats=stat($ulsfn);
+			if (opendir(LSDIR,$ulsdir)) {
+                          while ($ulsfn=readdir(LSDIR)) {
+			     my @ulsstats=stat($ulsdir.'/'.$ulsfn);
                              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
                           }
+                          closedir(LSDIR);
+		        }
 		       } else {
                           $ulsout='no_such_dir';
                        }