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

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 28 Sep 2006 02:15:06 -0000


albertel		Wed Sep 27 22:15:06 2006 EDT

  Modified files:              
    /doc/loncapafiles	sanitycheck.piml 
  Log:
  - sprea.tab can have more in it now
  
  
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.17 doc/loncapafiles/sanitycheck.piml:1.18
--- doc/loncapafiles/sanitycheck.piml:1.17	Fri Sep 15 16:55:15 2006
+++ doc/loncapafiles/sanitycheck.piml	Wed Sep 27 22:15:06 2006
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.17 2006/09/15 20:55:15 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.18 2006/09/28 02:15:06 albertel Exp $ -->
 
 <!--
 
@@ -189,12 +189,14 @@
 my $rbug=0;
 my $dbug=0;
 my $sbug=0;
-while (&lt;IN&gt;) {
- if (/\S/) {
-  $rbug=1 if /\r/;
-  $dbug=1 if $_=~/\W.*\n$/;
-  $dbug=1 if $_=~/\_/;
-  $sbug=1 if /\s.+$/;
+while (my $line = &lt;IN&gt;) {
+ if ($line =~ /\S/) {
+  $rbug=1 if $line=~/\r/;
+  if ($line =~ /\W/) {
+	$dbug=$line if ($line !~/\w:(?:primary|default)$/);
+  }
+  $dbug=$line if $line=~/\_/;
+  $sbug=1 if $line=~/\s.+$/;
  }
 }
 close IN;
@@ -202,7 +204,7 @@
   print "**** ERROR **** <TARGET /> is DOS-formatted\n";
 }
 if ($dbug) {
-  print "**** ERROR **** <TARGET /> has invalid host id\n";
+  print "**** ERROR **** <TARGET /> has invalid host id ($dbug)\n";
 }
 if ($sbug) {
   print "**** ERROR **** <TARGET /> has illegal whitespace character\n";