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

[albertel]

albertel		Wed Jul 17 13:55:07 2002 EDT

  Modified files:              
    /doc/loncapafiles	sanitycheck.piml 
    /loncom	development_hosts.tab 
  Log:
  - sanitycehcking of the hosts.tab supports the new option 6th colum and allows spaces in it.
  - reverted develpment hosts.tab
  - (BUG#570)
  
  
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.2 doc/loncapafiles/sanitycheck.piml:1.3
--- doc/loncapafiles/sanitycheck.piml:1.2	Wed May 15 21:46:29 2002
+++ doc/loncapafiles/sanitycheck.piml	Wed Jul 17 13:55:07 2002
@@ -1,7 +1,7 @@
 <!-- sanitycheck.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: sanitycheck.piml,v 1.2 2002/05/16 01:46:29 harris41 Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.3 2002/07/17 17:55:07 albertel Exp $ -->
 
 <!--
 
@@ -73,8 +73,14 @@
   $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 +91,7 @@
   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";
Index: loncom/development_hosts.tab
diff -u loncom/development_hosts.tab:1.10 loncom/development_hosts.tab:1.11
--- loncom/development_hosts.tab:1.10	Fri Jul  5 13:29:34 2002
+++ loncom/development_hosts.tab	Wed Jul 17 13:55:07 2002
@@ -1,20 +1,19 @@
-fsul1:fsu:library:frootmig.physics.fsu.edu:128.186.7.43
+fsul1:fsu:library:frootmig.physics.fsu.edu:128.186.7.43:Florida State University
 fsul2:fsu:library:tycho.physics.fsu.edu:128.186.7.100
-103l3:103:library:kirk.lite.msu.edu:35.8.63.41
+103l3:103:library:kirk.lite.msu.edu:35.8.63.41:Room 103
 103l4:103:library:s18.lite.msu.edu:35.8.63.28
 103l5:103:library:s17.lite.msu.edu:35.8.63.27
-103l6:103:library:tmp8.lite.msu.edu:35.8.63.98
-msua1:msu:access:agrajag.lite.msu.edu:35.8.63.68
-pnetl1:physnet:library:bistromath.lite.msu.edu:35.8.63.67
+msua1:msu:access:agrajag.lite.msu.edu:35.8.63.68:Michigan State University
+pnetl1:physnet:library:bistromath.lite.msu.edu:35.8.63.67:CBI
 103l1:103:library:deepthought.lite.msu.edu:35.8.63.54
 msul1:msu:library:data.lite.msu.edu:35.8.63.49
-gerdl1:gerd:library:picard.lite.msu.edu:35.8.63.46
+gerdl1:gerd:library:picard.lite.msu.edu:35.8.63.46:Gerd Office
 103l2:103:library:marvin.lite.msu.edu:35.8.63.57
 rauxpo:umass:library:rauxpo.bio.umass.edu:128.119.54.20
 oucapa1:ohiou:library:capa1.phy.ohiou.edu:132.235.24.28
 itdslon:msu:library:itdsvh2.cl.msu.edu:35.8.3.172
 tmccbifrost:tmcc:library:bifrost.tmcc.edu:134.197.153.204
-annarborl1:annarbor:library:bgp01020009bgs.sanarb01.mi.comcast.net:68.40.67.234
-nscll1:nscl:library:lonkashy.nscl.msu.edu:35.8.32.89
+annarborl1:annarbor:library:annarbor.albertelli.com:127.0.0.1:Guy at Home
+nscll1:nscl:library:lonkashy.nscl.msu.edu:35.8.32.89:Cyclotron
 umichwebsvcs:umich:library:141.213.237.107:141.213.237.107
 volverine:umich:library:instructor.physics.lsa.umich.edu:141.211.100.160