--- loncom/lond	2003/03/07 15:04:00	1.112
+++ loncom/lond	2003/03/14 19:29:36	1.114
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.112 2003/03/07 15:04:00 matthew Exp $
+# $Id: lond,v 1.114 2003/03/14 19:29:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -263,17 +263,25 @@ sub checkchildren {
         } 
     }
     sleep 5;
+    $SIG{ALRM} = sub { die "timeout" };
+    $SIG{__DIE__} = 'DEFAULT';
     foreach (sort keys %children) {
         unless (-e "$docdir/lon-status/londchld/$_.txt") {
+          eval {
+            alarm(300);
 	    &logthis('Child '.$_.' did not respond');
 	    kill 9 => $_;
 	    $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
 	    $subj="LON: $perlvar{'lonHostID'} killed lond process $_";
 	    my $result=`echo 'Killed lond process $_.' | mailto $emailto -s '$subj' > /dev/null`;
 	    $execdir=$perlvar{'lonDaemons'};
-	    $result=`/bin/cp $execdir/logs/lond.log $execdir/logs/lond.log.$_`
+	    $result=`/bin/cp $execdir/logs/lond.log $execdir/logs/lond.log.$_`;
+	    alarm(0);
+	  }
         }
     }
+    $SIG{ALRM} = 'DEFAULT';
+    $SIG{__DIE__} = \&cathcexception;
 }
 
 # --------------------------------------------------------------------- Logging
@@ -1768,20 +1776,26 @@ sub currentversion {
     if ($fname=~/^(.+)\/[^\/]+$/) {
        $ulsdir=$1;
     }
+    my ($fnamere1,$fnamere2);
+    # remove version if already specified
     $fname=~s/\.\d+\.(\w+(?:\.meta)*)$/\.$1/;
-    $fname=~s/\.(\w+(?:\.meta)*)$/\.\(\\d\+\)\.$1\$/;
-
+    # get the bits that go before and after the version number
+    if ( $fname=~/^(.*\.)(\w+(?:\.meta)*)$/ ) {
+	$fnamere1=$1;
+	$fnamere2='.'.$2;
+    }
     if (-e $fname) { $version=1; }
     if (-e $ulsdir) {
        if(-d $ulsdir) {
           if (opendir(LSDIR,$ulsdir)) {
+
              while ($ulsfn=readdir(LSDIR)) {
 # see if this is a regular file (ignore links produced earlier)
                  my $thisfile=$ulsdir.'/'.$ulsfn;
                  unless (-l $thisfile) {
-		    if ($thisfile=~/$fname/) {
-		        if ($1>$version) { $version=$1; }
-                    }
+		     if ($thisfile=~/\Q$fnamere1\E(\d+)\Q$fnamere2\E/) {
+			 if ($1>$version) { $version=$1; }
+		     }
 		 }
              }
              closedir(LSDIR);