[LON-CAPA-cvs] cvs: loncom / lond

www lon-capa-cvs@mail.lon-capa.org
Mon, 17 Oct 2005 20:09:01 -0000


www		Mon Oct 17 16:09:01 2005 EDT

  Modified files:              
    /loncom	lond 
  Log:
  Bug #4418: somehow, we now also have <obsolete>1</obsolete>
  
  
Index: loncom/lond
diff -u loncom/lond:1.300 loncom/lond:1.301
--- loncom/lond:1.300	Fri Oct 14 15:08:31 2005
+++ loncom/lond	Mon Oct 17 16:09:01 2005
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.300 2005/10/14 19:08:31 albertel Exp $
+# $Id: lond,v 1.301 2005/10/17 20:09:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.300 $'; #' stupid emacs
+my $VERSION='$Revision: 1.301 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1422,7 +1422,7 @@
 			open(FILE, $ulsdir.'/'.$ulsfn.".meta");
 			my @obsolete=<FILE>;
 			foreach my $obsolete (@obsolete) {
-			    if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+			    if($obsolete =~ m/(<obsolete>)(on|1)/) { $obs = 1; } 
 			    if($obsolete =~ m|(<copyright>)(default)|) { $rights = 1; }
 			}
 		    }
@@ -1490,7 +1490,7 @@
                         open(FILE, $ulsdir.'/'.$ulsfn.".meta");
                         my @obsolete=<FILE>;
                         foreach my $obsolete (@obsolete) {
-                            if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+                            if($obsolete =~ m/(<obsolete>)(on|1)/) { $obs = 1; } 
                             if($obsolete =~ m|(<copyright>)(default)|) {
                                 $rights = 1;
                             }