--- doc/loncapafiles/updatequery.piml	2002/06/06 15:44:27	1.14
+++ doc/loncapafiles/updatequery.piml	2002/09/08 23:57:51	1.19
@@ -1,7 +1,7 @@
 <!-- updatequery.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: updatequery.piml,v 1.14 2002/06/06 15:44:27 harris41 Exp $ -->
+<!-- $Id: updatequery.piml,v 1.19 2002/09/08 23:57:51 harris41 Exp $ -->
 
 <!--
 
@@ -145,6 +145,11 @@ END
 }
   my $choice=&lt;&gt;;
   chomp($choice);
+  my $bad_domain_flag=0;
+  my @bad_domain_names=('raw','userfiles','priv','adm','uploaded');
+  foreach my $bad (@bad_domain_names) {
+    $bad_domain_flag=1 if $choice eq $bad;
+  }
   if ($ipdomain and $choice=~/^\s*$/) {
     $choice=$ipdomain;
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
@@ -161,6 +166,10 @@ END
     $r='l';
     $flag=1;
   }
+  elsif ($bad_domain_flag) {
+    print "Invalid input ('$choice' conflicts with LON-CAPA namespace).\n";
+    print "Please try something different than '$choice'\n";
+  }
   else {
     print "Invalid input (only alphanumeric characters supported).\n";
   }
@@ -264,16 +273,13 @@ my %perlvar;
     $perlvar{'lonDefDomain'}=$lonDefDomain;
     $perlvar{'lonAdmEMail'}=$lonAdmEMail;
     $perlvar{'lonRole'}=$lonRole;
-    unless ($perlvar{'lonSqlAccess'}) {
-       $perlvar{'lonSqlAccess'}='localhostkey';
-    }
-    unless ($perlvar{'lonLoadLim'}) {
+    unless ($perlvar{'lonLoadLim'} and $perlvar{'lonLoadLim'}!~/\{\[\[\[\[/) {
        $perlvar{'lonLoadLim'}='2.00';
     }
-    unless ($perlvar{'lonExpire'}) {
+    unless ($perlvar{'lonExpire'} and $perlvar{'lonExpire'}!~/\{\[\[\[\[/) {
        $perlvar{'lonExpire'}='86400';
     }
-    unless ($perlvar{'lonReceipt'}) {
+    unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
        my $lonReceipt='';
        srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
        my @alnum=(0..9,a..z);
@@ -299,7 +305,6 @@ END
 <perlscript mode='fg'>
 # read values from loncapa.conf
 my $confdir='/etc/httpd/conf/';
-#my $confdir='';
 my $filename='loncapa.conf';
 my %perlvar;
     if (-e "$confdir$filename") {
@@ -314,6 +319,21 @@ my %perlvar;
 	}
 	close(CONFIG);
     }
+    unless ($perlvar{'lonLoadLim'} and $perlvar{'lonLoadLim'}!~/\{\[\[\[\[/) {
+       $perlvar{'lonLoadLim'}='2.00';
+    }
+    unless ($perlvar{'lonExpire'} and $perlvar{'lonExpire'}!~/\{\[\[\[\[/) {
+       $perlvar{'lonExpire'}='86400';
+    }
+    unless ($perlvar{'lonReceipt'} and $perlvar{'lonReceipt'}!~/\{\[\[\[\[/) {
+       my $lonReceipt='';
+       srand(time ^ $$ ^ unpack "%L*", `ps axww | gzip`);
+       my @alnum=(0..9,a..z);
+       foreach my $i (1..20) {
+	 $lonReceipt.=$alnum[int(rand(36))];
+       }
+       $perlvar{'lonReceipt'}=$lonReceipt;
+    }
 my %perlvarstatic;
     if (-e "${confdir}loncapa_apache.conf") {
 	open(CONFIG,'&lt;'.$confdir.'loncapa_apache.conf') or 
@@ -331,6 +351,7 @@ my %perlvarstatic;
 # update loncapa.conf until 7 is entered
 
 $flag=0;
+
 while (!$flag) {
   print(&lt;&lt;END);
 
@@ -344,6 +365,30 @@ This is now the current configuration of
 6) Server Load: $perlvar{'lonLoadLim'}
 7) Everything is correct up above
 END
+my $hbug=-1;
+my $dbug=-1;
+{
+  my $v=$perlvar{'lonHostID'};
+  $hbug=0;
+  $hbug=1 if $v=~/\W/;
+  $hbug=1 if $v=~/\_/;
+}
+{
+  my $v=$1;
+  $dbug=0;
+  $dbug=1 if $v=~/\W/;
+  $dbug=1 if $v=~/\_/;
+}
+
+if ($hbug) {
+  print "**** ERROR **** ".
+	"Invalid lonHostID (should only be letters and/or digits)\n";
+}
+if ($dbug) {
+  print "**** ERROR **** ".
+	"Invalid lonDefDomain (should only be letters and/or digits)\n";
+}
+
   print(&lt;&lt;END);
 ENTER A CHOICE OF 1-6 TO CHANGE, otherwise ENTER 7:
 END
@@ -351,7 +396,7 @@ my $choice=&lt;&gt;;
 chomp($choice);
   if ($choice==1) {
   print(&lt;&lt;END);
-2) Domain Name: $perlvar{'lonDefDomain'}
+1) Domain Name: $perlvar{'lonDefDomain'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
@@ -360,7 +405,7 @@ END
   }
   elsif ($choice==2) {
   print(&lt;&lt;END);
-1) Machine Name: $perlvar{'lonHostID'}
+2) Machine Name: $perlvar{'lonHostID'}
 ENTER NEW VALUE:
 END
     my $choice2=&lt;&gt;;
@@ -454,23 +499,50 @@ while (!$flag) {
   print "ENTER 1, 2, 3, or 4:\n";
   my $choice=&lt;&gt;;
   chomp($choice);
-    $line2insert=&lt;&lt;END;
+  $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;
+  $date=`date -I`; chomp($date);
+  $lonHostID=$perlvar{'lonHostID'};
+  $lonHostID=~s/\W//g;
+  $lineexistflag=0;
+  $hostidexistflag=0;
   if ($choice==1) {
-    $lonCluster='production';
+    $lonCluster='production'; $flag=1;
+  }
+  elsif ($choice==2) {
+    $lonCluster='standalone'; $flag=1;
+    open(OUT,'&gt;../'.$lonCluster.'_hosts.tab') or
+      die('file generation error');
+      print(OUT $line2insert);
+    close(OUT);
+  }
+  elsif ($choice==3) {
+    $lonCluster='development'; $flag=1;
+  }
+  elsif ($choice==4) {
+    $lonCluster='existing'; $flag=1;
+    if (-e '/home/httpd/lonTabs/hosts.tab') {
+      `cp /home/httpd/lonTabs/hosts.tab ../existing_hosts.tab`;
+    }
+    else {
+      print &lt;&lt;END;
+There is no existing /home/httpd/lonTabs/hosts.tab
+END
+      die('');
+    }
+  }
+  elsif ($choice==26) {
+    $lonCluster='rawhide'; $flag=1;
+  }
+  if ($flag==1) {
     `rm -f ../hosts.tab`;
-    open(IN,'&lt;../production_hosts.tab');
+    open(IN,'&lt;../'.$lonCluster.'_hosts.tab');
     while(&lt;IN&gt;) {
       if (/^$line2insert$/) {
         $lineexistflag=1;
       }
-      if (/^$perlvar{'lonHostID'}\:/) {
+      if (/^$lonHostID\:/) {
         $hostidexistflag=1;
       }
     }
@@ -478,65 +550,42 @@ END
     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
+loncapa/loncom/${lonCluster}_hosts.tab.  The entry inside
+${lonCluster}_hosts.tab does not match your settings.
+The entry inside ${lonCluster}_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");
+      `grep -v "$lonHostID:" ../${lonCluster}_hosts.tab &gt; ../new_${lonCluster}_hosts.tab`;
+       open(OUT,'&gt;&gt;../new_'.$lonCluster.'_hosts.tab') or
+         die("cannot open loncom/${lonCluster}_hosts.tab for output\n");
          print(OUT $line2insert);
        close(OUT);
-      `ln -s new_production_hosts.tab ../hosts.tab`;
+      `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
       # email appropriate message
-      `echo "REPLACE:$lonHostID:date:$line2insert" | mail -s "REPLACE:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
+      system('ping -c 1 www.lon-capa.org > /dev/null || ping -c 1 www.msu.edu > /dev/null || ping -c 1 www.mit.edu > /dev/null');
+      `echo "REPLACE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "REPLACE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org` unless $?;
     }
     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`;
+      print &lt;&lt;END;
+Entry exists in ${lonCluster}_hosts.tab.
+END
+      `ln -s ${lonCluster}_hosts.tab ../hosts.tab`;
+      # email appropriate message
+      `echo "STABLEUPDATE:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "STABLEUPDATE:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
     }
-    $flag=1;
-  }
-  elsif ($choice==2) {
-    $lonCluster='standalone';
-    open(OUT,'&gt;../standalone_hosts.tab') or
-      die("cannot open loncom/standalone_hosts.tab for output\n");
-    print(OUT &lt;&lt;END);
-$perlvar{'lonHostID'}:$perlvar{'lonDefDomain'}:$perlvar{'lonRole'}:$hostname:$hostaddress
+    elsif (!$hostidexistflag and !$lineexistflag) {
+      print &lt;&lt;END;
+New entry for $lonCluster.
 END
-    close(OUT);
-    `rm -f ../hosts.tab`;
-    `ln -s standalone_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  elsif ($choice==3) {
-    $lonCluster='development';
-    `rm -f loncom/hosts.tab`;
-    `ln -s development_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  elsif ($choice==4) {
-    $lonCluster='existing';
-    `rm -f ../hosts.tab`;
-    `touch existing_hosts.tab`;
-    if (-e '/home/httpd/lonTabs/hosts.tab') {
-      `cp /home/httpd/lonTabs/hosts.tab ../existing_hosts.tab`;
+      `cat ../${lonCluster}_hosts.tab &gt; ../new_${lonCluster}_hosts.tab`;
+       open(OUT,'&gt;../new_'.$lonCluster.'_hosts.tab') or
+         die("cannot open loncom/${lonCluster}_hosts.tab for output\n");
+         print(OUT $line2insert);
+       close(OUT);
+      `ln -s new_${lonCluster}_hosts.tab ../hosts.tab`;
+      # email appropriate message
+      `echo "INSERT:$lonCluster:$lonHostID:$date:$line2insert" | mail -s "INSERT:$lonCluster:$lonHostID:$date" installrecord\@mail.lon-capa.org`;
     }
-    `ln -s existing_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  elsif ($choice==26) {
-    $lonCluster='rawhide';
-    `rm -f ../hosts.tab`;
-    `ln -s rawhide_hosts.tab ../hosts.tab`;
-    $flag=1;
-  }
-  else {
-
   }
 }