[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm lonmysql.pm lonnavmaps.pm lonwhatsnew.pm

[albertel]

albertel		Mon Apr 11 11:33:46 2005 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm lonmysql.pm lonnavmaps.pm 
                     	lonwhatsnew.pm 
  Log:
  - wrap_symb ddoes the checking so no need to check it before calling it
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.161 loncom/interface/lonfeedback.pm:1.162
--- loncom/interface/lonfeedback.pm:1.161	Mon Apr 11 11:29:38 2005
+++ loncom/interface/lonfeedback.pm	Mon Apr 11 11:33:46 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.161 2005/04/11 15:29:38 albertel Exp $
+# $Id: lonfeedback.pm,v 1.162 2005/04/11 15:33:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2866,10 +2866,7 @@
     my @allres=$navmap->retrieveResources();
     foreach my $resource (@allres) {
         if ($resource->hasDiscussion()) {
-            my $ressymb = $resource->symb();
-            if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-                $ressymb = $resource->wrap_symb();
-            }
+            my $ressymb = $resource->wrap_symb();
             push @{$resourcesref}, $ressymb;
         }
     }
Index: loncom/interface/lonmysql.pm
diff -u loncom/interface/lonmysql.pm:1.29 loncom/interface/lonmysql.pm:1.30
--- loncom/interface/lonmysql.pm:1.29	Thu Apr  7 02:56:23 2005
+++ loncom/interface/lonmysql.pm	Mon Apr 11 11:33:46 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # MySQL utility functions
 #
-# $Id: lonmysql.pm,v 1.29 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonmysql.pm,v 1.30 2005/04/11 15:33:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -478,6 +478,7 @@
 ###############################
 sub get_dbh { 
     return undef if (! defined(&connect_to_db()));
+    &Apache::lonnet::logthis("reconnect set to ".$dbh->{mysql_auto_reconnect});
     return $dbh;
 }
 
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.322 loncom/interface/lonnavmaps.pm:1.323
--- loncom/interface/lonnavmaps.pm:1.322	Mon Apr 11 11:28:55 2005
+++ loncom/interface/lonnavmaps.pm	Mon Apr 11 11:33:46 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.322 2005/04/11 15:28:55 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.323 2005/04/11 15:33:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1588,11 +1588,7 @@
 	    my @allres=$navmap->retrieveResources();
 	    foreach my $resource (@allres) {
 		if ($resource->hasDiscussion()) {
-		    my $ressymb = $resource->symb();
-                    if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-                        $ressymb = $resource->wrap_symb();
-		    }
-		    $haveDisc .= $ressymb.':';
+		    $haveDisc .= $resource->wrap_symb().':';
 		    $totdisc ++;
 		}
 	    }
@@ -2285,11 +2281,8 @@
 
     #return defined($self->{DISCUSSION_TIME}->{$symb});
 
-# backward compatibility (bulletin boards used to be 'wrapped')
-    my $ressymb = $symb;
-    if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-        $ressymb = $self->wrap_symb($ressymb);
-    }
+    # backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb = $self->wrap_symb($symb);
     if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
         return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
     } else {
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.7 loncom/interface/lonwhatsnew.pm:1.8
--- loncom/interface/lonwhatsnew.pm:1.7	Mon Apr 11 09:14:00 2005
+++ loncom/interface/lonwhatsnew.pm	Mon Apr 11 11:33:46 2005
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.7 2005/04/11 13:14:00 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.8 2005/04/11 15:33:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -395,10 +395,7 @@
         %{$$bombed{$symb}} = ();
         %{$$ungraded{$symb}} = ();
         my $title = $resource->compTitle();
-        my $ressymb = $symb;
-        if ($ressymb =~ m-___adm/\w+/\w+/\d+/bulletinboard$-) {
-            $ressymb = $resource->wrap_symb();
-        }
+        my $ressymb = $resource->wrap_symb();
 # Check for unread discussion postings
         if (defined($discussiontime{$ressymb})) {
             push(@discussions,$ressymb);