--- doc/loncapafiles/updatequery.piml	2002/05/13 17:56:29	1.8
+++ doc/loncapafiles/updatequery.piml	2002/06/06 15:44:27	1.14
@@ -1,7 +1,7 @@
 <!-- updatequery.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: updatequery.piml,v 1.8 2002/05/13 17:56:29 harris41 Exp $ -->
+<!-- $Id: updatequery.piml,v 1.14 2002/06/06 15:44:27 harris41 Exp $ -->
 
 <!--
 
@@ -52,7 +52,7 @@ sleep(3);
 </perlscript>
 </file>
 <file>
-<target dist='default'>/home/httpd/lonUsers2/</target>
+<target dist='default'>/home/httpd/lonTabs/hosts.tab</target>
 <perlscript mode='fg'>
 $|=1;
 unless (-e "<TARGET />") {
@@ -220,7 +220,7 @@ END
 # get e-mail address
 # accept if valid, if not valid, tell user and repeat
 $flag=0;
-my $lonAdmEmail;
+my $lonAdmEMail;
 while (!$flag) {
   print(&lt;&lt;END);
 
@@ -234,9 +234,9 @@ END
   chomp($choice);
   if ($choice=~/\@/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
-    print(OUT 'lonAdmEmail'."\t".$choice."\n");
+    print(OUT 'lonAdmEMail'."\t".$choice."\n");
     close(OUT);
-    $lonAdmEmail=$choice;
+    $lonAdmEMail=$choice;
     $flag=1;
   }
   else {
@@ -255,14 +255,14 @@ my %perlvar;
 	    if ($configline =~ /^[^\#]*PerlSetVar/) {
 		my ($unused,$varname,$varvalue)=split(/\s+/,$configline);
 		chomp($varvalue);
-		$perlvar{$varname}=$varvalue;
+		$perlvar{$varname}=$varvalue if $varvalue!~/^\{\[\[\[\[/;
 	    }
 	}
 	close(CONFIG);
     }
     $perlvar{'lonHostID'}=$lonHostID;
     $perlvar{'lonDefDomain'}=$lonDefDomain;
-    $perlvar{'lonAdmEmail'}=$lonAdmEmail;
+    $perlvar{'lonAdmEMail'}=$lonAdmEMail;
     $perlvar{'lonRole'}=$lonRole;
     unless ($perlvar{'lonSqlAccess'}) {
        $perlvar{'lonSqlAccess'}='localhostkey';
@@ -275,7 +275,7 @@ my %perlvar;
     }
     unless ($perlvar{'lonReceipt'}) {
        my $lonReceipt='';
-       srand($$.time);
+       srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
        my @alnum=(0..9,a..z);
        foreach my $i (1..20) {
 	 $lonReceipt.=$alnum[int(rand(36))];
@@ -338,7 +338,7 @@ while (!$flag) {
 This is now the current configuration of your machine.
 1) Domain Name: $perlvar{'lonDefDomain'}
 2) Machine Name: $perlvar{'lonHostID'}
-3) System Administrator's E-mail Address: $perlvar{'lonAdmEmail'}
+3) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
 4) Role: $perlvar{'lonRole'}
 5) Cache Expiration Time: $perlvar{'lonExpire'}
 6) Server Load: $perlvar{'lonLoadLim'}
@@ -369,12 +369,12 @@ END
   }
   elsif ($choice==3) {
   print(&lt;&lt;END);
-3) System Administrator's E-mail Address: $perlvar{'lonAdmEmail'}
+3) System Administrator's E-mail Address: $perlvar{'lonAdmEMail'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
     chomp($choice2);
-    $perlvar{'lonAdmEmail'}=$choice2;
+    $perlvar{'lonAdmEMail'}=$choice2;
   }
   elsif ($choice==4) {
   print(&lt;&lt;END);
@@ -454,10 +454,51 @@ while (!$flag) {
   print "ENTER 1, 2, 3, or 4:\n";
   my $choice=&lt;&gt;;
   chomp($choice);
+    $line2insert=&lt;&lt;END;
+$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$hostaddress
+END
+    $date=`date -I`; chomp($date);
+    $lonHostID=$perlvar{'lonHostID'};
+    $lonHostID=~s/\W//g;
+    $lineexistflag=0;
+    $hostidexistflag=0;
   if ($choice==1) {
     $lonCluster='production';
     `rm -f ../hosts.tab`;
-    `ln -s production_hosts.tab ../hosts.tab`;
+    open(IN,'&lt;../production_hosts.tab');
+    while(&lt;IN&gt;) {
+      if (/^$line2insert$/) {
+        $lineexistflag=1;
+      }
+      if (/^$perlvar{'lonHostID'}\:/) {
+        $hostidexistflag=1;
+      }
+    }
+    close(IN);
+    if ($hostidexistflag and !$lineexistflag) {
+      print &lt;&lt;END;
+WARNING: $lonHostID already exists inside
+loncapa/loncom/production_hosts.tab.  The entry inside
+production_hosts.tab does not match your settings.
+The entry inside production_hosts.tab is being replaced
+with your new values.
+END
+      `grep -v "$lonHostID:" ../production_hosts.tab &gt; ../new_production_hosts.tab`;
+       open(OUT,'&gt;&gt;../new_production_hosts.tab') or
+         die("cannot open loncom/standalone_hosts.tab for output\n");
+         print(OUT $line2insert);
+       close(OUT);
+      `ln -s new_production_hosts.tab ../hosts.tab`;
+      # email appropriate message
+      `echo "REPLACE:$lonHostID:date:$line2insert" | mail -s "REPLACE:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
+    }
+    elsif ($hostidexistflag and $lineexistflag) {
+      `ln -s production_hosts.tab ../hosts.tab`;
+    }
+    elsif (!$$hostidexistflag and !$lineexistflag) {
+      `cat ../production_hosts.tab &gt; ../new_production_hosts.tab`;
+      `ln -s new_production_hosts.tab &gt; ../hosts.tab`;
+    }
     $flag=1;
   }
   elsif ($choice==2) {