--- doc/loncapafiles/sanitycheck.piml	2002/03/03 04:29:10	1.1
+++ doc/loncapafiles/sanitycheck.piml	2002/07/17 17:55:07	1.3
@@ -1,7 +1,7 @@
 <!-- sanitycheck.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.1 2002/03/03 04:29:10 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.3 2002/07/17 17:55:07 albertel Exp $ -->
 
 <!--
 
@@ -33,19 +33,6 @@ http://www.lon-capa.org/
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
 <perlscript mode='fg'>
-my $diff=`diff ../../loncom/loncapa.conf <TARGET />`;
-if ($diff) {
-  print "**** ERROR **** There are unexpected differences for <TARGET />\n";
-}
-</perlscript>
-</file>
-<file>
-<target dist='default'>/etc/httpd/conf/access.conf</target>
-<perlscript mode='fg'>
-my $diff=`diff -y --suppress-common-lines ../access.conf <TARGET /> | grep -v PerlSetVar | grep -v 'Include conf/loncapa.conf'`;
-if ($diff) {
-  print "**** ERROR **** There are unexpected differences for <TARGET />\n";
-}
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
 my $dbug=-1;
@@ -86,8 +73,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;
@@ -98,7 +91,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";