--- doc/loncapafiles/sanitycheck.piml	2006/09/28 22:52:43	1.20
+++ doc/loncapafiles/sanitycheck.piml	2006/12/10 23:23:55	1.22
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.20 2006/09/28 22:52:43 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.22 2006/12/10 23:23:55 albertel Exp $ -->
 
 <!--
 
@@ -111,7 +111,6 @@ else # It exists, so look at the file me
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='suse9.3 suse9.2 sles9'>/etc/httpd/loncapa.conf</target>
 <target dist='sles10 suse10.1'>/etc/apache2/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
@@ -151,36 +150,39 @@ my $rbug=0;
 my $dbug=0;
 my $sbug=0;
 my $fbug=0;
+my %line;
+my $line=0;
 while (&lt;IN&gt;) {
+ $line++;
  next if (/^(\#|\s*$)/);
  if (/\S/) {
-  $rbug=1 if /\r/;
+  if (/\r/) {              $rbug=1; push(@{$line{'r'}},$line); }
   my @a=split(/\:/,$_);
-  $dbug=1 if $a[0]=~/\W/;
-  $dbug=1 if $a[0]=~/\_/;
-  $dbug=1 if $a[1]=~/\_/;
-  $dbug=1 if $a[1]=~/\W/;
-  $fbug=1 if (@a<4 || @a>5);
+  if ($a[0]=~/[^\w\-.]/ ||
+      $a[1]=~/[^\w\-.]/ ||
+      $a[0]=~/\_/       ||
+      $a[1]=~/\_/      ) { $dbug=1; push(@{$line{'d'}},$line); }
+  if (@a<4 || @a>5) {      $fbug=1; push(@{$line{'f'}},$line); }
   my $expr='\s.+$';
-  $sbug=1 if ($a[0] =~ /$expr/ ||
-	      $a[1] =~ /$expr/ ||
-	      $a[2] =~ /$expr/ ||
-	      $a[3] =~ /$expr/ )
+  if ($a[0] =~ /$expr/ ||
+      $a[1] =~ /$expr/ ||
+      $a[2] =~ /$expr/ ||
+      $a[3] =~ /$expr/ ) { $sbug=1; push(@{$line{'s'}},$line); }
 ;
  }
 }
 close IN;
 if ($rbug) {
-  print "**** ERROR **** <TARGET /> is DOS-formatted\n";
+  print "**** ERROR **** <TARGET /> is DOS-formatted (lines ".join(', ',@{$line{'r'}}).")\n";
 }
 if ($dbug) {
-  print "**** ERROR **** <TARGET /> has invalid host id or domain id\n";
+  print "**** ERROR **** <TARGET /> has invalid host id or domain id (lines ".join(', ',@{$line{'d'}}).")\n";
 }
 if ($fbug) {
-  print "**** ERROR **** <TARGET /> is lacking 4 or 5 columns for every row\n";
+  print "**** ERROR **** <TARGET /> is lacking 4 or 5 columns for every row (lines ".join(', ',@{$line{'f'}}).")\n";
 }
 if ($sbug) {
-  print "**** ERROR **** <TARGET /> has illegal whitespace character\n";
+  print "**** ERROR **** <TARGET /> has illegal whitespace character (lines ".join(', ',@{$line{'s'}}).")\n";
 }
 </file>
 <file>