[BACK]Return to updatequery.piml CVS log [TXT] [DIR] Up to [LON-CAPA] / doc / loncapafiles

Diff for /doc/loncapafiles/updatequery.piml between versions 1.38 and 1.41

version 1.38, 2005/05/21 15:35:07 version 1.41, 2005/08/15 17:53:33
Line 70  you must contact lon-capa\@lon-capa.org. Line 70  you must contact lon-capa\@lon-capa.org.
 3) DEVELOPMENT - you want to do software (not content!) development with  3) DEVELOPMENT - you want to do software (not content!) development with
                  this workstation and eventually link it with the                   this workstation and eventually link it with the
                  workstations of other LON-CAPA software developers.                   workstations of other LON-CAPA software developers.
 4) PRESERVE the existing hosts.tab and domain.tab  4) RUNNING YOUR OWN CLUSTER - this machine is not in the standard LON-CAPA
                 (/home/httpd/lonTabs/hosts.tab and                   clusters and won't be in the future and you want the existing
                  /home/httpd/lonTabs/domain.tab)                   hosts.tab and domain.tab files to be left alone.
                    (This choice is unlikely what you want to select.)
 END  END
 # Option number 26 will install rawhide_hosts.tab, but  # Option number 26 will install rawhide_hosts.tab, but
 # the typical user does not want to be part of an intensive  # the typical user does not want to be part of an intensive
Line 237  END Line 237  END
   my $choice=<>;    my $choice=<>;
   chomp($choice);    chomp($choice);
   my $bad_domain_flag=0;    my $bad_domain_flag=0;
   my @bad_domain_names=('res','raw','userfiles','priv','adm','uploaded');    my @bad_domain_names=('res','raw','userfiles','priv','adm','uploaded',
    'editupload');
   foreach my $bad (@bad_domain_names) {    foreach my $bad (@bad_domain_names) {
     $bad_domain_flag=1 if $choice eq $bad;      $bad_domain_flag=1 if $choice eq $bad;
   }    }
Line 591  my $error=''; Line 592  my $error='';
 foreach my $v ($perlvar{'lonDefDomain'},$perlvar{'lonHostID'}) {  foreach my $v ($perlvar{'lonDefDomain'},$perlvar{'lonHostID'}) {
    if (length($v)>16) { $error.="\nName $v too long"; }     if (length($v)>16) { $error.="\nName $v too long"; }
    if (length($v)<2) { $error.="\nName $v too short"; }     if (length($v)<2) { $error.="\nName $v too short"; }
    if ($v=~/capa/i) { $error.="\nName $v contains 'capa'"; }     if ($v=~/capa/i) {
    foreach my $bad ('res','raw','userfiles','priv','adm','uploaded') {   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',
    'editupload') {
       $error.="\nName $v reserved." if $v eq $bad;        $error.="\nName $v reserved." if $v eq $bad;
    }     }
    if ($v=~/\W/) { $error.="\nName $v contains special characters"; }     if ($v=~/\W/) { $error.="\nName $v contains special characters"; }
 }  }
 if ($domainDescription!~/^[\w\s]+$/) {  if ($domainDescription!~/^[\(\)\-\w\s]+$/) {
    $error.="\nDomain Description contains special characters";     $error.="\nDomain Description contains special characters";
 }   } 
 foreach my $v ($perlvar{'lonExpire'},$perlvar{'lonLoadLim'}) {  foreach my $v ($perlvar{'lonExpire'},$perlvar{'lonLoadLim'}) {
Removed from v.1.38  
changed lines
  Added in v.1.41

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