Diff for /doc/loncapafiles/updatequery.piml between versions 1.16 and 1.18

version 1.16, 2002/06/12 17:07:55 version 1.18, 2002/08/17 19:05:03
Line 145  END Line 145  END
 }  }
   my $choice=<>;    my $choice=<>;
   chomp($choice);    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*$/) {    if ($ipdomain and $choice=~/^\s*$/) {
     $choice=$ipdomain;      $choice=$ipdomain;
     open(OUT,'>>/tmp/loncapa_updatequery.out');      open(OUT,'>>/tmp/loncapa_updatequery.out');
Line 161  END Line 166  END
     $r='l';      $r='l';
     $flag=1;      $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";      print "Invalid input (only alphanumeric characters supported).\n";
   }    }
Line 342  my %perlvarstatic; Line 351  my %perlvarstatic;
 # update loncapa.conf until 7 is entered  # update loncapa.conf until 7 is entered
   
 $flag=0;  $flag=0;
   
 while (!$flag) {  while (!$flag) {
   print(<<END);    print(<<END);
   
Line 355  This is now the current configuration of Line 365  This is now the current configuration of
 6) Server Load: $perlvar{'lonLoadLim'}  6) Server Load: $perlvar{'lonLoadLim'}
 7) Everything is correct up above  7) Everything is correct up above
 END  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(<<END);    print(<<END);
 ENTER A CHOICE OF 1-6 TO CHANGE, otherwise ENTER 7:  ENTER A CHOICE OF 1-6 TO CHANGE, otherwise ENTER 7:
 END  END

Removed from v.1.16  
changed lines
  Added in v.1.18


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>