--- loncom/lond	2000/06/29 20:43:03	1.13
+++ loncom/lond	2000/09/25 20:22:58	1.21
@@ -7,7 +7,7 @@
 # 12/7,12/15,01/06,01/11,01/12,01/14,2/8,
 # 03/07,05/31 Gerd Kortemeyer
 # 06/26 Scott Harrison
-# 06/29 Gerd Kortemeyer
+# 06/29,06/30,07/14,07/15,07/17,07/20,07/25,09/18 Gerd Kortemeyer
 #
 # based on "Perl Cookbook" ISBN 1-56592-243-3
 # preforker - server who forks first
@@ -38,6 +38,17 @@ while ($configline=<CONFIG>) {
 }
 close(CONFIG);
 
+# --------------------------------------------- Check if other instance running
+
+my $pidfile="$perlvar{'lonDaemons'}/logs/lond.pid";
+
+if (-e $pidfile) {
+   my $lfh=IO::File->new("$pidfile");
+   my $pide=<$lfh>;
+   chomp($pide);
+   if (kill 0 => $pide) { die "already running"; }
+}
+
 $PREFORK=4; # number of children to maintain, at least four spare
 
 # ------------------------------------------------------------- Read hosts file
@@ -217,7 +228,7 @@ sub propath {
     my ($udom,$uname)=@_;
     $udom=~s/\W//g;
     $uname=~s/\W//g;
-    my $subdir=$uname;
+    my $subdir=$uname.'__';
     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
     my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
     return $proname;
@@ -333,15 +344,18 @@ sub make_new_child {
                   } else {
 		      &logthis(
  "<font color=blue>WARNING: $clientip did not reply challenge</font>");
+                      print $client "bye\n";
                   }
               } else {
 		  &logthis(
                     "<font color=blue>WARNING: "
                    ."$clientip failed to initialize: >$remotereq< </font>");
+		  print $client "bye\n";
               }
 	    } else {
               &logthis(
  "<font color=blue>WARNING: Unknown client $clientip</font>");
+              print $client "bye\n";
             }
             if ($clientok) {
 # ---------------- New known client connecting, could mean machine online again
@@ -513,6 +527,15 @@ sub make_new_child {
                                  &logthis(
                                   "LWP GET: $message for $fname ($remoteurl)");
                              } else {
+	                         if ($remoteurl!~/\.meta$/) {
+                                  my $mrequest=
+                                   new HTTP::Request('GET',$remoteurl.'.meta');
+                                  my $mresponse=
+                                   $ua->request($mrequest,$fname.'.meta');
+                                  if ($mresponse->is_error()) {
+		                    unlink($fname.'.meta');
+                                  }
+	                         }
                                  rename($transname,$fname);
 			     }
                           }
@@ -541,6 +564,9 @@ sub make_new_child {
                        my $ownership=ishome($fname);
                        if ($ownership eq 'owner') {
                         if (-e $fname) {
+			 if (-d $fname) {
+			   print $client "directory\n";
+                         } else {
                            $now=time;
                            { 
                             my $sh=IO::File->new(">$fname.$hostid{$clientip}");
@@ -549,6 +575,7 @@ sub make_new_child {
                            $fname=~s/\/home\/httpd\/html\/res/raw/;
                            $fname="http://$thisserver/".$fname;
                            print $client "$fname\n";
+		         }
                         } else {
 		      	   print $client "not_found\n";
                         }
@@ -647,7 +674,7 @@ sub make_new_child {
                        my @queries=split(/\&/,$what);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
                            for ($i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
@@ -670,7 +697,7 @@ sub make_new_child {
                        my @queries=split(/\&/,$what);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
                            for ($i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
@@ -732,7 +759,7 @@ sub make_new_child {
                        $namespace=~s/\W//g;
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
                            foreach $key (keys %hash) {
                                $qresult.="$key&";
                            }
@@ -753,7 +780,7 @@ sub make_new_child {
                        $namespace=~s/\W//g;
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
                            foreach $key (keys %hash) {
                                $qresult.="$key=$hash{$key}&";
                            }
@@ -817,7 +844,7 @@ sub make_new_child {
                        chomp($rid);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
                 	   my $version=$hash{"version:$rid"};
                            $qresult.="version=$version&";
                            my $scope;
@@ -827,7 +854,7 @@ sub make_new_child {
                               my $key;
                               $qresult.="$scope:keys=$vkeys&";
                               foreach $key (@keys) {
-	     $qresult.="$version:$key=".$hash{"$scope:$rid:$key"}."&";
+	     $qresult.="$scope:$key=".$hash{"$scope:$rid:$key"}."&";
                               }                                  
                            }
 			   if (untie(%hash)) {
@@ -892,7 +919,7 @@ sub make_new_child {
                        my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
                        my @queries=split(/\&/,$what);
                        my $qresult='';
-                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT,0640)) {
+                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER,0640)) {
                            for ($i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
@@ -952,6 +979,7 @@ sub make_new_child {
 		       } else {
                           $ulsout='no_such_dir';
                        }
+                       if ($ulsout eq '') { $ulsout='empty'; }
                        print $client "$ulsout\n";
 # ------------------------------------------------------------- unknown command
                    } else {