[LON-CAPA-cvs] cvs: doc /loncapafiles updatequery.piml

[albertel]

albertel		Fri Jul  1 14:21:49 2005 EDT

  Modified files:              
    /doc/loncapafiles	updatequery.piml 
  Log:
   uwsp got a machine named capa too
  
  
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.38 doc/loncapafiles/updatequery.piml:1.39
--- doc/loncapafiles/updatequery.piml:1.38	Sat May 21 11:35:07 2005
+++ doc/loncapafiles/updatequery.piml	Fri Jul  1 14:21:47 2005
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.38 2005/05/21 15:35:07 www Exp $ -->
+<!-- $Id: updatequery.piml,v 1.39 2005/07/01 18:21:47 albertel Exp $ -->
 
 <!--
 
@@ -591,7 +591,12 @@
 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) { $error.="\nName $v contains 'capa'"; }
+   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;
    }