--- loncom/lond	2001/02/12 18:21:47	1.36
+++ loncom/lond	2001/03/27 13:37:43	1.45
@@ -12,6 +12,8 @@
 # 12/05,12/13,12/29 Gerd Kortemeyer
 # Jan 01 Scott Harrison
 # 02/12 Gerd Kortemeyer
+# 03/15 Scott Harrison
+# 03/24 Gerd Kortemeyer
 #
 # based on "Perl Cookbook" ISBN 1-56592-243-3
 # preforker - server who forks first
@@ -64,7 +66,7 @@ my $wwwid=getpwnam('www');
 if ($wwwid!=$<) {
    $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
    $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
-   system("echo 'User ID mismatch.  loncron must be run as user www.' |\
+   system("echo 'User ID mismatch.  lond must be run as user www.' |\
  mailto $emailto -s '$subj' > /dev/null");
    exit 1;
 }
@@ -667,6 +669,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";
@@ -964,15 +969,25 @@ 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;
 			   print $client "ok\n";
@@ -1068,10 +1083,13 @@ sub make_new_child {
                        my $ulsout='';
                        my $ulsfn;
                        if (-e $ulsdir) {
-                          while ($ulsfn=<$ulsdir/*>) {
+			if (opendir(LSDIR,$ulsdir)) {
+                          while ($ulsfn=readdir(LSDIR)) {
 			     my @ulsstats=stat($ulsfn);
                              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
                           }
+                          closedir(LSDIR);
+		        }
 		       } else {
                           $ulsout='no_such_dir';
                        }