--- doc/loncapafiles/updatequery.piml	2004/06/28 16:40:18	1.32
+++ doc/loncapafiles/updatequery.piml	2005/02/06 07:57:57	1.35
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.32 2004/06/28 16:40:18 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.35 2005/02/06 07:57:57 albertel Exp $ -->
 
 <!--
 
@@ -383,7 +383,7 @@ END
   my $choice=&lt;&gt;;
   chomp($choice);
   $choice =~ s/\s//g;
-  if ( ($choice=~/\@/) || $choice eq '') ) {
+  if ( ($choice=~/\@/) || $choice eq '') {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonSupportEMail'."\t".$choice."\n");
     close(OUT);
@@ -559,7 +559,7 @@ This is now the current configuration of
  2) Domain Description: $domainDescription
  3) Machine Name: $perlvar{'lonHostID'}
  4) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
- 5) Support E-mail Address: $perlvar{'lonSupportEmail'}
+ 5) Support E-mail Address: $perlvar{'lonSupportEMail'}
  6) Role: $perlvar{'lonRole'}
  7) Cache Expiration Time: $perlvar{'lonExpire'}
  8) Server Load: $perlvar{'lonLoadLim'}
@@ -738,15 +738,13 @@ END
 <perlscript mode='fg'>
 unless (-l "<TARGET />") {
   my $hostname=`hostname`;chomp($hostname);
-  my $hostaddress=`hostname -i $hostname`;chomp($hostaddress);
-  $hostaddress=~s/\s//;
   $date=`date -I`; chomp($date);
   $lonHostID=$perlvar{'lonHostID'};
   $lonHostID=~s/\W//g;
   $lineexistflag=0;
   $hostidexistflag=0;
   $line2insert=&lt;&lt;END;
-$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$hostaddress
+$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname
 END
   $domaininsert="$perlvar{'lonDefDomain'}:$domainDescription:$domainTabExtras\n";
   if ($lonCluster eq 'standalone') {
@@ -786,8 +784,7 @@ END
        close(OUT);
       `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
       # email appropriate message
-      system('ping -c 1 -W 5 www.lon-capa.org > /dev/null || ping -c 1 -W 5 www.msu.edu > /dev/null || ping -c 1 -W 5 www.mit.edu > /dev/null');
-      `echo "REPLACE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "REPLACE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org` unless $?;
+      `echo "REPLACE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "REPLACE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
     }
     elsif ($hostidexistflag and $lineexistflag) {
       print &lt;&lt;END;
@@ -839,8 +836,7 @@ END
        close(OUT);
       `ln -s new_${lonCluster}_domain.tab ../domain.tab`;
       # email appropriate message
-      system('ping -c 1 -W 5 www.lon-capa.org > /dev/null || ping -c 1 -W 5 www.msu.edu > /dev/null || ping -c 1 -W 5 www.mit.edu > /dev/null');
-      `echo "REPLACEdom:$lonCluster:$lonHostID:$date:$domaninsert" | mail -s "REPLACEdom:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org` unless $?;
+      `echo "REPLACEdom:$lonCluster:$lonHostID:$date:$domaninsert" | mail -s "REPLACEdom:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
     }
     elsif ($domainexistflag and $lineexistflag) {
       print &lt;&lt;END;