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

[albertel]

albertel		Mon Aug 15 13:53:33 2005 EDT

  Modified files:              
    /doc/loncapafiles	updatequery.piml 
  Log:
  - allow - and () in domain descriptions
  
  
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.40 doc/loncapafiles/updatequery.piml:1.41
--- doc/loncapafiles/updatequery.piml:1.40	Tue Aug  2 17:25:43 2005
+++ doc/loncapafiles/updatequery.piml	Mon Aug 15 13:53:33 2005
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.40 2005/08/02 21:25:43 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.41 2005/08/15 17:53:33 albertel Exp $ -->
 
 <!--
 
@@ -237,7 +237,8 @@
   my $choice=&lt;&gt;;
   chomp($choice);
   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) {
     $bad_domain_flag=1 if $choice eq $bad;
   }
@@ -597,12 +598,13 @@
 		 $error.="\nName $v contains 'capa'"; 
 	}
    }
-   foreach my $bad ('res','raw','userfiles','priv','adm','uploaded') {
+   foreach my $bad ('res','raw','userfiles','priv','adm','uploaded',
+	'editupload') {
       $error.="\nName $v reserved." if $v eq $bad;
    }
    if ($v=~/\W/) { $error.="\nName $v contains special characters"; }
 }
-if ($domainDescription!~/^[\w\s]+$/) {
+if ($domainDescription!~/^[\(\)\-\w\s]+$/) {
    $error.="\nDomain Description contains special characters";
 } 
 foreach my $v ($perlvar{'lonExpire'},$perlvar{'lonLoadLim'}) {