--- doc/loncapafiles/updatequery.piml	2004/06/29 15:18:41	1.33
+++ doc/loncapafiles/updatequery.piml	2005/07/01 18:21:47	1.39
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.33 2004/06/29 15:18:41 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.39 2005/07/01 18:21:47 albertel Exp $ -->
 
 <!--
 
@@ -196,7 +196,7 @@ while (!$flag) {
 }
 
 # need to recommend a machine ID name (ipdomain.l.somenumber)
-my $hostname=`hostname`; chomp($hostname);
+my $hostname=`hostname -f`; chomp($hostname);
 my $ipdomain='';
 if ($hostname=~/([^\.]*)\.([^\.]*)$/) {
   $ipdomain=$1;
@@ -206,7 +206,17 @@ if ($hostname=~/([^\.]*)\.([^\.]*)$/) {
 
 **** Domain ****
 [this does NOT need to correspond to internet address domains,
- examples might be "msu" or "bionet" or "vermontcc"]
+ good examples might be "msu" or "bionet" or "vermontcc",
+ bad examples are "physics" (too general)
+   or "michiganstateuniversity" (too long)
+   or "msuedu" (internet domain, just make it "msu")
+   or "msuphysics" (only if there is a good reason to limit)
+   or "mydomain" (what is that?)
+ Please make this name short AND descriptive of your organization.
+ Note that the domain is very hard to change later.
+ Double-check with the LON-CAPA group at MSU if this domain is 
+ going to be part of the main production cluster, since it needs
+ to be unique.]
 END
 
 # get domain name
@@ -227,10 +237,13 @@ END
   my $choice=&lt;&gt;;
   chomp($choice);
   my $bad_domain_flag=0;
-  my @bad_domain_names=('raw','userfiles','priv','adm','uploaded');
+  my @bad_domain_names=('res','raw','userfiles','priv','adm','uploaded');
   foreach my $bad (@bad_domain_names) {
     $bad_domain_flag=1 if $choice eq $bad;
   }
+  if ($choice=~/capa/i) {
+     $bad_domain_flag=1;
+  }
   if ($ipdomain and $choice=~/^\s*$/) {
     $choice=$ipdomain;
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
@@ -238,20 +251,21 @@ END
     close(OUT);
     $lonDefDomain=$choice;
     $flag=1;
-  }
-  elsif ($choice!~/\_/ and $choice=~/^\w+$/) {
+  } elsif (length($choice)>12) {
+    print "Name too long\n";
+  } elsif (length($choice)<2) {
+    print "Name too short\n";
+  } elsif ($bad_domain_flag) {
+    print "Invalid input ('$choice' conflicts with LON-CAPA namespace).\n";
+    print "Please try something different than '$choice'\n";
+  } elsif ($choice!~/\_/ and $choice=~/^\w+$/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonDefDomain'."\t".$choice."\n");
     close(OUT);
     $lonDefDomain=$choice;
     $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 {
+  } else {
     print "Invalid input (only alphanumeric characters supported).\n";
   }
 }
@@ -296,8 +310,9 @@ if ($lonDefDomain) {
 [this does NOT need to correspond to internet address names;
  this name MUST be unique to the whole LON-CAPA network;
  we recommend that you use a name based off of your institution;
- good examples: "msul1" or "bionetl1";
- bad examples: "loncapabox" or "studentsinside"]
+ good examples: "msul1" or "bioneta2";
+ bad examples: "loncapabox" or "studentsinside".
+ Note that machine names are very hard to change later.]
 END
 # get machine name
 # accept if valid, if not valid, tell user and repeat
@@ -315,22 +330,26 @@ END
 }
   my $choice=&lt;&gt;;
   chomp($choice);
-  if ($lonHostID and $choice=~/^\s*$/) {
+  if ($choice=~/capa/i) {
+    print "Invalid input (names containing 'capa' are reserved).\n";
+  } elsif ($lonHostID and $choice=~/^\s*$/) {
     $choice=$lonHostID;
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonHostID'."\t".$choice."\n");
     close(OUT);
     $lonHostID=$choice;
     $flag=1;
-  }
-  elsif ($choice!~/\_/ and $choice=~/^\w+$/) {
+  } elsif (length($choice)>15) {
+    print "Name too long\n";
+  } elsif (length($choice)<4) {
+    print "Name too short\n";
+  } elsif ($choice!~/\_/ and $choice=~/^\w+$/) {
     open(OUT,'&gt;&gt;/tmp/loncapa_updatequery.out');
     print(OUT 'lonHostID'."\t".$choice."\n");
     close(OUT);
     $lonHostID=$choice;
     $flag=1;
-  }
-  else {
+  } else {
     print "Invalid input (only alphanumeric characters supported).\n";
   }
 }
@@ -567,30 +586,32 @@ This is now the current configuration of
 10) Allow only secure connections: $securestatus 
 11) 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";
-}
 
+my $error='';
+foreach my $v ($perlvar{'lonDefDomain'},$perlvar{'lonHostID'}) {
+   if (length($v)>16) { $error.="\nName $v too long"; }		
+   if (length($v)<2) { $error.="\nName $v too short"; }
+   if ($v=~/capa/i) {
+	if ($v!~/^oucapa\d+$/ && 
+	    ($v!~/^capa\d+$/ && $perlvar{'lonDefDomain'} eq 'uwsp')) {
+		 $error.="\nName $v contains 'capa'"; 
+	}
+   }
+   foreach my $bad ('res','raw','userfiles','priv','adm','uploaded') {
+      $error.="\nName $v reserved." if $v eq $bad;
+   }
+   if ($v=~/\W/) { $error.="\nName $v contains special characters"; }
+}
+if ($domainDescription!~/^[\w\s]+$/) {
+   $error.="\nDomain Description contains special characters";
+} 
+foreach my $v ($perlvar{'lonExpire'},$perlvar{'lonLoadLim'}) {
+   unless ($v=~/^[\d+\.]+$/) { $error.="\nNumber expected instead of $v"; }
+}
+unless (($perlvar{'lonRole'} eq 'library') || ($perlvar{'lonRole'} eq 'access')) {
+   $error.="\nInvalid Role";
+}
+if ($error) { print "\n*** ERRORS: $error\n"; }
   print(&lt;&lt;END);
 ENTER A CHOICE OF 1-10 TO CHANGE, otherwise ENTER 11:
 END
@@ -715,11 +736,11 @@ END
     }
     ($securestatus,$securenum)=&securesetting(%perlvar);
   }
-  elsif ($choice==11) {
+  elsif (($choice==11) && (!$error)) {
     $flag=1;
   }
   else {
-
+    print "Invalid input.\n";
   }
 }
     open(OUT,"&gt;$confdir$filename") or
@@ -737,16 +758,14 @@ END
 <target dist='default'>loncom/hosts.tab</target>
 <perlscript mode='fg'>
 unless (-l "<TARGET />") {
-  my $hostname=`hostname`;chomp($hostname);
-  my $hostaddress=`hostname -i $hostname`;chomp($hostaddress);
-  $hostaddress=~s/\s//;
+  my $hostname=`hostname -f`;chomp($hostname);
   $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 +805,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 +857,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;