--- doc/loncapafiles/sanitycheck.piml	2002/05/16 01:46:29	1.2
+++ doc/loncapafiles/sanitycheck.piml	2002/08/15 15:41:57	1.4
@@ -1,7 +1,9 @@
+<!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
+	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.2 2002/05/16 01:46:29 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.4 2002/08/15 15:41:57 harris41 Exp $ -->
 
 <!--
 
@@ -73,8 +75,14 @@ while (&lt;IN&gt;) {
   $dbug=1 if $a[0]=~/\_/;
   $dbug=1 if $a[1]=~/\_/;
   $dbug=1 if $a[1]=~/\W/;
-  $fbug=1 if @a!=5;
-  $sbug=1 if /\s.+$/;
+  $fbug=1 if (@a<5 || @a>6);
+  my $expr='\s.+$';
+  $sbug=1 if ($a[0] =~ /$expr/ ||
+	      $a[1] =~ /$expr/ ||
+	      $a[2] =~ /$expr/ ||
+	      $a[3] =~ /$expr/ ||
+	      $a[4] =~ /$expr/ )
+;
  }
 }
 close IN;
@@ -85,7 +93,7 @@ if ($dbug) {
   print "**** ERROR **** <TARGET /> has invalid host id or domain id\n";
 }
 if ($fbug) {
-  print "**** ERROR **** <TARGET /> is lacking 5 columns for every row\n";
+  print "**** ERROR **** <TARGET /> is lacking 5 or 6 columns for every row\n";
 }
 if ($sbug) {
   print "**** ERROR **** <TARGET /> has illegal whitespace character\n";